X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=cyclegraph.cc;h=49ff00249fe9c49dbe9a1cda9fdad32af78c0f70;hp=7fadcbda00d8b6f02f9cfe81d5cd3f423e9a3a2b;hb=0330918c2798a36363a197bf500a5646b048a687;hpb=5236e7a4403ccc6d28b3fdc746c5710d6190310a

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 7fadcbd..49ff002 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -3,6 +3,7 @@
 #include "common.h"
 #include "promise.h"
 #include "model.h"
+#include "threads-model.h"
 
 /** Initializes a CycleGraph object. */
 CycleGraph::CycleGraph() :
@@ -38,8 +39,7 @@ void CycleGraph::putNode(const ModelAction *act, CycleNode *node)
  */
 void CycleGraph::putNode(const Promise *promise, CycleNode *node)
 {
-	const ModelAction *reader = promise->get_action();
-	readerToPromiseNode.put(reader, node);
+	promiseToNode.put(promise, node);
 #if SUPPORT_MOD_ORDER_DUMP
 	nodeList.push_back(node);
 #endif
@@ -51,8 +51,7 @@ void CycleGraph::putNode(const Promise *promise, CycleNode *node)
  */
 void CycleGraph::erasePromiseNode(const Promise *promise)
 {
-	const ModelAction *reader = promise->get_action();
-	readerToPromiseNode.put(reader, NULL);
+	promiseToNode.put(promise, NULL);
 #if SUPPORT_MOD_ORDER_DUMP
 	/* Remove the promise node from nodeList */
 	CycleNode *node = getNode_noCreate(promise);
@@ -73,7 +72,7 @@ CycleNode * CycleGraph::getNode_noCreate(const ModelAction *act) const
 /** @return The corresponding CycleNode, if exists; otherwise NULL */
 CycleNode * CycleGraph::getNode_noCreate(const Promise *promise) const
 {
-	return readerToPromiseNode.get(promise->get_action());
+	return promiseToNode.get(promise);
 }
 
 /**
@@ -116,10 +115,10 @@ CycleNode * CycleGraph::getNode(const Promise *promise)
 /**
  * @return false if the resolution results in a cycle; true otherwise
  */
-bool CycleGraph::resolvePromise(ModelAction *reader, ModelAction *writer,
+bool CycleGraph::resolvePromise(const Promise *promise, ModelAction *writer,
 		promise_list_t *mustResolve)
 {
-	CycleNode *promise_node = readerToPromiseNode.get(reader);
+	CycleNode *promise_node = promiseToNode.get(promise);
 	CycleNode *w_node = actionToNode.get(writer);
 	ASSERT(promise_node);
 
@@ -316,16 +315,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();
-		fprintf(file, "P%u", idx);
+		int idx = model->get_promise_number(promise);
+		fprintf(file, "P%d", 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);
@@ -335,31 +333,33 @@ 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::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);
 	}
 }
 
@@ -443,6 +443,8 @@ bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) cons
 		CycleNode *node = queue.back();
 		queue.pop_back();
 
+		if (node->getPromise() == promise)
+			return true;
 		if (!node->is_promise() &&
 				promise->eliminate_thread(node->getAction()->get_tid()))
 			return true;