optimize hashtable so we don't always build new ones for cyclegraph check

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index d0258d180f6e60546bc9619b1b3f56c86bda33de..f0f04ffee0c3ca1f9cd3ef2edf46c2743e6c0515 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -8,7 +8,10 @@
 #include "hashtable.h"
 #include <vector>
 #include <inttypes.h>
+#include "config.h"
+#include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -19,29 +22,60 @@ class CycleGraph {
        ~CycleGraph();
        void addEdge(const ModelAction *from, const ModelAction *to);
        bool checkForCycles();
-       void addRMWEdge(const ModelAction *from, const ModelAction *to);
+       bool checkForRMWViolation();
+       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
+       bool checkPromise(const ModelAction *from, Promise *p);
+       bool checkReachable(const ModelAction *from, const ModelAction *to);
+       void startChanges();
+       void commitChanges();
+       void rollbackChanges();
+#if SUPPORT_MOD_ORDER_DUMP
+       void dumpNodes(FILE *file);
+       void dumpGraphToFile(const char * filename);
+#endif
 
+       SNAPSHOTALLOC
  private:
        CycleNode * getNode(const ModelAction *);
+       HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> * discovered;
 
        /** @brief A table for mapping ModelActions to CycleNodes */
        HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+#if SUPPORT_MOD_ORDER_DUMP
+       std::vector<CycleNode *> nodeList;
+#endif
 
        bool checkReachable(CycleNode *from, CycleNode *to);
 
        /** @brief A flag: true if this graph contains cycles */
        bool hasCycles;
+       bool oldCycles;
+
+       bool hasRMWViolation;
+       bool oldRMWViolation;
+
+       std::vector<CycleNode *> rollbackvector;
+       std::vector<CycleNode *> rmwrollbackvector;
 };
 
 /** @brief A node within a CycleGraph; corresponds to one ModelAction */
 class CycleNode {
  public:
        CycleNode(const ModelAction *action);
-       void addEdge(CycleNode * node);
+       bool addEdge(CycleNode * node);
        std::vector<CycleNode *> * getEdges();
        bool setRMW(CycleNode *);
        CycleNode* getRMW();
+       const ModelAction * getAction() {return action;};
+
+       void popEdge() {
+               edges.pop_back();
+       };
+       void clearRMW() {
+               hasRMW=NULL;
+       }
 
+       SNAPSHOTALLOC
  private:
        /** @brief The ModelAction that this node represents */
        const ModelAction *action;