X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.cc;h=f060a00e74362b6f9df99649ffd844f7e416d4b9;hb=bdef0741b8a01e16946d261bc2a657af5a683b3e;hp=6676f2f0a7ea4a000f2555810cbc4f31f0112263;hpb=37c87f91496ff3e713003c21692c63b8e87d81fb;p=model-checker.git

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 6676f2f..f060a00 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -19,36 +19,57 @@ CycleNode * CycleGraph::getNode(const ModelAction * action) {
 	return node;
 }
 
-/** Adds an edge between two ModelActions. */
-void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
+/**
+ * Adds an edge between two ModelActions.  The ModelAction to happens after the
+ * ModelAction from.
+ */
+void CycleGraph::addEdge(const ModelAction *to, const ModelAction *from) {
 	CycleNode *fromnode=getNode(from);
 	CycleNode *tonode=getNode(to);
+
 	if (!hasCycles) {
 		// Check for Cycles
 		hasCycles=checkReachable(tonode, fromnode);
 	}
 	fromnode->addEdge(tonode);
+
+	CycleNode * rmwnode=fromnode->getRMW();
+
+	//If the fromnode has a rmwnode that is not the tonode, we
+	//should add an edge between its rmwnode and the tonode
+
+	if (rmwnode!=NULL&&rmwnode!=tonode) {
+		if (!hasCycles) {
+			// Check for Cycles
+			hasCycles=checkReachable(tonode, rmwnode);
+		}
+		rmwnode->addEdge(tonode);
+	}
 }
 
-void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
+/** Handles special case of a RMW action.  The ModelAction rmw reads
+ *  from the ModelAction from.  The key differences are: (1) no write
+ *  can occur in between the rmw and the from action.  Only one RMW
+ *  action can read from a given write.
+ */
+void CycleGraph::addRMWEdge(const ModelAction *rmw, const ModelAction * from) {
 	CycleNode *fromnode=getNode(from);
 	CycleNode *rmwnode=getNode(rmw);
 
 	/* Two RMW actions cannot read from the same write. */
-	if (fromnode->setRMW())
+	if (fromnode->setRMW(rmwnode)) {
 		hasCycles=true;
+	}
 
 	/* Transfer all outgoing edges from the from node to the rmw node */
 	/* This process cannot add a cycle because rmw should not have any
 		 incoming edges yet.*/
 	std::vector<CycleNode *> * edges=fromnode->getEdges();
-	for(unsigned int i=0;edges->size();i++) {
+	for(unsigned int i=0;i<edges->size();i++) {
 		CycleNode * tonode=(*edges)[i];
 		rmwnode->addEdge(tonode);
 	}
-	if (!hasCycles) {
-		hasCycles=checkReachable(rmwnode, fromnode);
-	}
+
 	fromnode->addEdge(rmwnode);
 }
 
@@ -85,6 +106,7 @@ bool CycleGraph::checkForCycles() {
 /** Constructor for a CycleNode. */
 CycleNode::CycleNode(const ModelAction *modelaction) {
 	action=modelaction;
+	hasRMW=NULL;
 }
 
 /** Returns a vector of the edges from a CycleNode. */
@@ -97,8 +119,14 @@ void CycleNode::addEdge(CycleNode * node) {
 	edges.push_back(node);
 }
 
-bool CycleNode::setRMW() {
-	bool oldhasRMW=hasRMW;
-	hasRMW=true;
-	return oldhasRMW;
+/** Get the RMW CycleNode that reads from the current CycleNode. */
+CycleNode* CycleNode::getRMW() {
+	return hasRMW;
+}
+
+/** Set a RMW action node that reads from the current CycleNode. */
+bool CycleNode::setRMW(CycleNode * node) {
+	CycleNode * oldhasRMW=hasRMW;
+	hasRMW=node;
+	return (oldhasRMW!=NULL);
 }