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

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 8f095dc..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() :
@@ -31,6 +32,37 @@ void CycleGraph::putNode(const ModelAction *act, CycleNode *node)
 #endif
 }
 
+/**
+ * Add a CycleNode to the graph, corresponding to a Promise
+ * @param promise The Promise that should be added
+ * @param node The CycleNode that corresponds to the Promise
+ */
+void CycleGraph::putNode(const Promise *promise, CycleNode *node)
+{
+	promiseToNode.put(promise, node);
+#if SUPPORT_MOD_ORDER_DUMP
+	nodeList.push_back(node);
+#endif
+}
+
+/**
+ * @brief Remove the Promise node from the graph
+ * @param promise The promise to remove from the graph
+ */
+void CycleGraph::erasePromiseNode(const Promise *promise)
+{
+	promiseToNode.put(promise, NULL);
+#if SUPPORT_MOD_ORDER_DUMP
+	/* Remove the promise node from nodeList */
+	CycleNode *node = getNode_noCreate(promise);
+	for (unsigned int i = 0; i < nodeList.size(); )
+		if (nodeList[i] == node)
+			nodeList.erase(nodeList.begin() + i);
+		else
+			i++;
+#endif
+}
+
 /** @return The corresponding CycleNode, if exists; otherwise NULL */
 CycleNode * CycleGraph::getNode_noCreate(const ModelAction *act) const
 {
@@ -40,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);
 }
 
 /**
@@ -72,11 +104,10 @@ CycleNode * CycleGraph::getNode(const ModelAction *action)
  */
 CycleNode * CycleGraph::getNode(const Promise *promise)
 {
-	const ModelAction *reader = promise->get_action();
 	CycleNode *node = getNode_noCreate(promise);
 	if (node == NULL) {
 		node = new CycleNode(promise);
-		readerToPromiseNode.put(reader, node);
+		putNode(promise, node);
 	}
 	return node;
 }
@@ -84,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);
 
@@ -95,7 +126,7 @@ bool CycleGraph::resolvePromise(ModelAction *reader, ModelAction *writer,
 		return mergeNodes(w_node, promise_node, mustResolve);
 	/* No existing write-node; just convert the promise-node */
 	promise_node->resolvePromise(writer);
-	readerToPromiseNode.put(reader, NULL); /* erase promise_node */
+	erasePromiseNode(promise_node->getPromise());
 	putNode(writer, promise_node);
 	return true;
 }
@@ -127,45 +158,46 @@ bool CycleGraph::mergeNodes(CycleNode *w_node, CycleNode *p_node,
 
 	/* Transfer the RMW */
 	CycleNode *promise_rmw = p_node->getRMW();
-	if (promise_rmw && promise_rmw != w_node->getRMW() && w_node->setRMW(promise_rmw))
+	if (promise_rmw && promise_rmw != w_node->getRMW() && w_node->setRMW(promise_rmw)) {
 		hasCycles = true;
+		return false;
+	}
 
 	/* Transfer back edges to w_node */
 	while (p_node->getNumBackEdges() > 0) {
 		CycleNode *back = p_node->removeBackEdge();
-		if (back != w_node) {
-			if (back->is_promise()) {
-				if (checkReachable(w_node, back)) {
-					/* Edge would create cycle; merge instead */
-					mustMerge->push_back(back->getPromise());
-					if (!mergeNodes(w_node, back, mustMerge))
-						return false;
-				} else
-					back->addEdge(w_node);
+		if (back == w_node)
+			continue;
+		if (back->is_promise()) {
+			if (checkReachable(w_node, back)) {
+				/* Edge would create cycle; merge instead */
+				mustMerge->push_back(back->getPromise());
+				if (!mergeNodes(w_node, back, mustMerge))
+					return false;
 			} else
-				addNodeEdge(back, w_node);
-		}
+				back->addEdge(w_node);
+		} else
+			addNodeEdge(back, w_node);
 	}
 
 	/* Transfer forward edges to w_node */
 	while (p_node->getNumEdges() > 0) {
 		CycleNode *forward = p_node->removeEdge();
-		if (forward != w_node) {
-			if (forward->is_promise()) {
-				if (checkReachable(forward, w_node)) {
-					mustMerge->push_back(forward->getPromise());
-					if (!mergeNodes(w_node, forward, mustMerge))
-						return false;
-				} else
-					w_node->addEdge(forward);
+		if (forward == w_node)
+			continue;
+		if (forward->is_promise()) {
+			if (checkReachable(forward, w_node)) {
+				mustMerge->push_back(forward->getPromise());
+				if (!mergeNodes(w_node, forward, mustMerge))
+					return false;
 			} else
-				addNodeEdge(w_node, forward);
-		}
+				w_node->addEdge(forward);
+		} else
+			addNodeEdge(w_node, forward);
 	}
 
-	/* erase p_node */
-	readerToPromiseNode.put(promise->get_action(), NULL);
-	delete p_node;
+	erasePromiseNode(promise);
+	/* Not deleting p_node, to maintain consistency if mergeNodes() fails */
 
 	return !hasCycles;
 }
@@ -275,26 +307,59 @@ bool CycleGraph::addEdge(const T *from, const U *to)
 
 	return addNodeEdge(fromnode, tonode);
 }
-/* Instantiate three forms of CycleGraph::addEdge */
+/* Instantiate four forms of CycleGraph::addEdge */
 template bool CycleGraph::addEdge(const ModelAction *from, const ModelAction *to);
 template bool CycleGraph::addEdge(const ModelAction *from, const Promise *to);
 template bool CycleGraph::addEdge(const Promise *from, const ModelAction *to);
+template bool CycleGraph::addEdge(const Promise *from, const Promise *to);
 
 #if SUPPORT_MOD_ORDER_DUMP
+
+static void print_node(FILE *file, const CycleNode *node, int label)
+{
+	if (node->is_promise()) {
+		const Promise *promise = node->getPromise();
+		int idx = model->get_promise_number(promise);
+		fprintf(file, "P%d", idx);
+		if (label) {
+			int first = 1;
+			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);
+					first = 0;
+				}
+			fprintf(file, "\"]");
+		}
+	} else {
+		const ModelAction *act = node->getAction();
+		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 *cn = nodeList[i];
-		const ModelAction *action = cn->getAction();
-		fprintf(file, "N%u [label=\"%u, T%u\"];\n", action->get_seq_number(), action->get_seq_number(), action->get_tid());
-		if (cn->getRMW() != NULL) {
-			fprintf(file, "N%u -> N%u[style=dotted];\n", action->get_seq_number(), cn->getRMW()->getAction()->get_seq_number());
-		}
-		for (unsigned int j = 0; j < cn->getNumEdges(); j++) {
-			CycleNode *dst = cn->getEdge(j);
-			const ModelAction *dstaction = dst->getAction();
-			fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
-		}
+		CycleNode *n = nodeList[i];
+		print_node(file, n, 1);
+		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);
 	}
 }
 
@@ -341,13 +406,13 @@ bool CycleGraph::checkReachable(const CycleNode *from, const CycleNode *to) cons
 }
 
 /**
- * Checks whether one ModelAction can reach another ModelAction/Promise
- * @param from The ModelAction from which to begin exploration
+ * Checks whether one ModelAction/Promise can reach another ModelAction/Promise
+ * @param from The ModelAction or Promise from which to begin exploration
  * @param to The ModelAction or Promise to reach
  * @return True, @a from can reach @a to; otherwise, false
  */
-template <typename T>
-bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
+template <typename T, typename U>
+bool CycleGraph::checkReachable(const T *from, const U *to) const
 {
 	CycleNode *fromnode = getNode_noCreate(from);
 	CycleNode *tonode = getNode_noCreate(to);
@@ -357,11 +422,13 @@ bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
 
 	return checkReachable(fromnode, tonode);
 }
-/* Instantiate two forms of CycleGraph::checkReachable */
+/* Instantiate three forms of CycleGraph::checkReachable */
 template bool CycleGraph::checkReachable(const ModelAction *from,
 		const ModelAction *to) const;
 template bool CycleGraph::checkReachable(const ModelAction *from,
 		const Promise *to) const;
+template bool CycleGraph::checkReachable(const Promise *from,
+		const ModelAction *to) const;
 
 /** @return True, if the promise has failed; false otherwise */
 bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) const
@@ -376,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;