X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.cc;h=be7885c5c1d66a71837f16f07433a913b8c209c1;hb=4e4fa53414eb5f0a78e05478127b375d5f0aba73;hp=1dbb12d9d25e2179895554817133b1c0267f179d;hpb=65173f9717220115340c919eb746bc13386ee902;p=model-checker.git

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 1dbb12d..be7885c 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -151,7 +151,8 @@ bool CycleGraph::mergeNodes(CycleNode *w_node, CycleNode *p_node,
 	ASSERT(p_node->is_promise());
 
 	const Promise *promise = p_node->getPromise();
-	if (!promise->is_compatible(w_node->getAction())) {
+	if (!promise->is_compatible(w_node->getAction()) ||
+			!promise->same_value(w_node->getAction())) {
 		hasCycles = true;
 		return false;
 	}
@@ -315,16 +316,15 @@ template bool CycleGraph::addEdge(const Promise *from, const Promise *to);
 
 #if SUPPORT_MOD_ORDER_DUMP
 
-static void print_node(const CycleNode *node, FILE *file, int label)
+static void print_node(FILE *file, const CycleNode *node, int label)
 {
-	modelclock_t idx;
 	if (node->is_promise()) {
 		const Promise *promise = node->getPromise();
-		idx = promise->get_action()->get_seq_number();
+		int idx = model->get_promise_number(promise);
 		fprintf(file, "P%u", idx);
 		if (label) {
 			int first = 1;
-			fprintf(file, " [label=\"P%u, T", idx);
+			fprintf(file, " [label=\"P%d, T", idx);
 			for (unsigned int i = 0 ; i < model->get_num_threads(); i++)
 				if (promise->thread_is_available(int_to_id(i))) {
 					fprintf(file, "%s%u", first ? "": ",", i);
@@ -334,31 +334,50 @@ static void print_node(const CycleNode *node, FILE *file, int label)
 		}
 	} else {
 		const ModelAction *act = node->getAction();
-		idx = act->get_seq_number();
+		modelclock_t idx = act->get_seq_number();
 		fprintf(file, "N%u", idx);
 		if (label)
 			fprintf(file, " [label=\"N%u, T%u\"]", idx, act->get_tid());
 	}
 }
 
+static void print_edge(FILE *file, const CycleNode *from, const CycleNode *to, const char *prop)
+{
+	print_node(file, from, 0);
+	fprintf(file, " -> ");
+	print_node(file, to, 0);
+	if (prop && strlen(prop))
+		fprintf(file, " [%s]", prop);
+	fprintf(file, ";\n");
+}
+
+void CycleGraph::dot_print_node(FILE *file, const ModelAction *act)
+{
+	print_node(file, getNode(act), 1);
+}
+
+template <typename T, typename U>
+void CycleGraph::dot_print_edge(FILE *file, const T *from, const U *to, const char *prop)
+{
+	CycleNode *fromnode = getNode(from);
+	CycleNode *tonode = getNode(to);
+
+	print_edge(file, fromnode, tonode, prop);
+}
+/* Instantiate two forms of CycleGraph::dot_print_edge */
+template void CycleGraph::dot_print_edge(FILE *file, const Promise *from, const ModelAction *to, const char *prop);
+template void CycleGraph::dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
+
 void CycleGraph::dumpNodes(FILE *file) const
 {
 	for (unsigned int i = 0; i < nodeList.size(); i++) {
 		CycleNode *n = nodeList[i];
-		print_node(n, file, 1);
+		print_node(file, n, 1);
 		fprintf(file, ";\n");
-		if (n->getRMW() != NULL) {
-			print_node(n, file, 0);
-			fprintf(file, " -> ");
-			print_node(n->getRMW(), file, 0);
-			fprintf(file, "[style=dotted];\n");
-		}
-		for (unsigned int j = 0; j < n->getNumEdges(); j++) {
-			print_node(n, file, 0);
-			fprintf(file, " -> ");
-			print_node(n->getEdge(j), file, 0);
-			fprintf(file, ";\n");
-		}
+		if (n->getRMW())
+			print_edge(file, n, n->getRMW(), "style=dotted");
+		for (unsigned int j = 0; j < n->getNumEdges(); j++)
+			print_edge(file, n, n->getEdge(j), NULL);
 	}
 }