cyclegraph: bugfix - use model-checker's allocater for CycleNode::edges

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index 81d736962dcb6893c8ef213b9571454c24ac5ea6..d9fa631879b361923ea3cf6f9bc21740983b0acf 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -8,9 +8,10 @@
 #include "hashtable.h"
 #include <vector>
 #include <inttypes.h>
-
+#include "config.h"
 #include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -23,18 +24,26 @@ class CycleGraph {
        bool checkForCycles();
        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);
 
@@ -53,10 +62,13 @@ class CycleGraph {
 class CycleNode {
  public:
        CycleNode(const ModelAction *action);
-       void addEdge(CycleNode * node);
-       std::vector<CycleNode *> * getEdges();
+       bool addEdge(CycleNode * node);
+       CycleNode * getEdge(unsigned int i) const;
+       unsigned int getNumEdges() const;
        bool setRMW(CycleNode *);
        CycleNode* getRMW();
+       const ModelAction * getAction() {return action;};
+
        void popEdge() {
                edges.pop_back();
        };
@@ -70,7 +82,7 @@ class CycleNode {
        const ModelAction *action;
 
        /** @brief The edges leading out from this node */
-       std::vector<CycleNode *> edges;
+       std::vector<CycleNode *, SnapshotAlloc<CycleNode *> > edges;
 
        /** Pointer to a RMW node that reads from this node, or NULL, if none
         * exists */