another bug fix...

[model-checker.git] / cyclegraph.cc

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 3168923a8c0f260c137755e7775f99a643ab96a5..2bac4de7cf0469c57818ceab835458a872bb7c29 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -1,9 +1,13 @@
 #include "cyclegraph.h"
 #include "action.h"
+#include "common.h"
 
 /** Initializes a CycleGraph object. */
 CycleGraph::CycleGraph() :
-       hasCycles(false)
+       hasCycles(false),
+       oldCycles(false),
+       hasRMWViolation(false),
+       oldRMWViolation(false)
 {
 }
 
@@ -32,6 +36,9 @@ CycleNode * CycleGraph::getNode(const ModelAction *action) {
  * @param from The edge comes from this ModelAction
  */
 void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
+       ASSERT(from);
+       ASSERT(to);
+
        CycleNode *fromnode=getNode(from);
        CycleNode *tonode=getNode(to);
 
@@ -39,6 +46,8 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
                // Check for Cycles
                hasCycles=checkReachable(tonode, fromnode);
        }
+
+       rollbackvector.push_back(fromnode);
        fromnode->addEdge(tonode);
 
        CycleNode * rmwnode=fromnode->getRMW();
@@ -51,6 +60,7 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
                        // Check for Cycles
                        hasCycles=checkReachable(tonode, rmwnode);
                }
+               rollbackvector.push_back(rmwnode);
                rmwnode->addEdge(tonode);
        }
 }
@@ -61,12 +71,17 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
  *  action can read from a given write.
  */
 void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
+       ASSERT(from);
+       ASSERT(rmw);
+
        CycleNode *fromnode=getNode(from);
        CycleNode *rmwnode=getNode(rmw);
 
        /* Two RMW actions cannot read from the same write. */
        if (fromnode->setRMW(rmwnode)) {
-               hasCycles=true;
+               hasRMWViolation=true;
+       } else {
+               rmwrollbackvector.push_back(fromnode);
        }
 
        /* Transfer all outgoing edges from the from node to the rmw node */
@@ -75,9 +90,10 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
        std::vector<CycleNode *> * edges=fromnode->getEdges();
        for(unsigned int i=0;i<edges->size();i++) {
                CycleNode * tonode=(*edges)[i];
+               rollbackvector.push_back(rmwnode);
                rmwnode->addEdge(tonode);
        }
-
+       rollbackvector.push_back(fromnode);
        fromnode->addEdge(rmwnode);
 }
 
@@ -126,11 +142,46 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
        return false;
 }
 
+void CycleGraph::startChanges() {
+       ASSERT(rollbackvector.size()==0);
+       ASSERT(rmwrollbackvector.size()==0);
+       ASSERT(oldCycles==hasCycles);
+       ASSERT(oldRMWViolation==hasRMWViolation);
+}
+
+/** Commit changes to the cyclegraph. */
+void CycleGraph::commitChanges() {
+       rollbackvector.resize(0);
+       rmwrollbackvector.resize(0);
+       oldCycles=hasCycles;
+       oldRMWViolation=hasRMWViolation;
+}
+
+/** Rollback changes to the previous commit. */
+void CycleGraph::rollbackChanges() {
+       for (unsigned int i = 0; i < rollbackvector.size(); i++) {
+               rollbackvector[i]->popEdge();
+       }
+
+       for (unsigned int i = 0; i < rmwrollbackvector.size(); i++) {
+               rmwrollbackvector[i]->clearRMW();
+       }
+
+       hasCycles = oldCycles;
+       hasRMWViolation = oldRMWViolation;
+       rollbackvector.resize(0);
+       rmwrollbackvector.resize(0);
+}
+
 /** @returns whether a CycleGraph contains cycles. */
 bool CycleGraph::checkForCycles() {
        return hasCycles;
 }
 
+bool CycleGraph::checkForRMWViolation() {
+       return hasRMWViolation;
+}
+
 /**
  * Constructor for a CycleNode.
  * @param modelaction The ModelAction for this node
@@ -166,7 +217,8 @@ CycleNode * CycleNode::getRMW() {
  * @see CycleGraph::addRMWEdge
  */
 bool CycleNode::setRMW(CycleNode *node) {
-       CycleNode * oldhasRMW=hasRMW;
+       if (hasRMW!=NULL)
+               return true;
        hasRMW=node;
-       return (oldhasRMW!=NULL);
+       return false;
 }