cyclegraph: bugfix - more SnapshotAlloc

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index 1cc0d069531e6499aed90a3972bfd1ff533c3c8f..8fac5eb590c671682d48a6b8a8377bdeed21e2c2 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -37,6 +37,7 @@ class CycleGraph {
        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;
@@ -53,8 +54,8 @@ class CycleGraph {
        bool hasRMWViolation;
        bool oldRMWViolation;
 
-       std::vector<CycleNode *> rollbackvector;
-       std::vector<CycleNode *> rmwrollbackvector;
+       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
+       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
 };
 
 /** @brief A node within a CycleGraph; corresponds to one ModelAction */
@@ -62,7 +63,8 @@ class CycleNode {
  public:
        CycleNode(const ModelAction *action);
        bool addEdge(CycleNode * node);
-       std::vector<CycleNode *> * getEdges();
+       CycleNode * getEdge(unsigned int i) const;
+       unsigned int getNumEdges() const;
        bool setRMW(CycleNode *);
        CycleNode* getRMW();
        const ModelAction * getAction() {return action;};
@@ -80,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 */