Merge branch 'demsky'

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index d0258d180f6e60546bc9619b1b3f56c86bda33de..0bb01c4c15ec608aa06a1892103635c4973ed039 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -19,7 +19,11 @@ class CycleGraph {
        ~CycleGraph();
        void addEdge(const ModelAction *from, const ModelAction *to);
        bool checkForCycles();
-       void addRMWEdge(const ModelAction *from, const ModelAction *to);
+       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
+
+       bool checkReachable(const ModelAction *from, const ModelAction *to);
+       void commitChanges();
+       void rollbackChanges();
 
  private:
        CycleNode * getNode(const ModelAction *);
@@ -31,6 +35,11 @@ class CycleGraph {
 
        /** @brief A flag: true if this graph contains cycles */
        bool hasCycles;
+
+       bool oldCycles;
+
+       std::vector<CycleNode *> rollbackvector;
+       std::vector<CycleNode *> rmwrollbackvector;
 };
 
 /** @brief A node within a CycleGraph; corresponds to one ModelAction */
@@ -41,6 +50,12 @@ class CycleNode {
        std::vector<CycleNode *> * getEdges();
        bool setRMW(CycleNode *);
        CycleNode* getRMW();
+       void popEdge() {
+               edges.pop_back();
+       };
+       void clearRMW() {
+               hasRMW=NULL;
+       }
 
  private:
        /** @brief The ModelAction that this node represents */