More bug fixes

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index c9481b788caf00fd939670e45a99c7b8256ae445..716e811d64ea6ea4153572d6d9c485762b0988ef 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -23,12 +23,12 @@ class CycleGraph {
 public:
        CycleGraph();
        ~CycleGraph();
-       void addEdges(SnapList<ModelAction *> * edgeset, const ModelAction *to);
-       void addEdge(const ModelAction *from, const ModelAction *to);
-       void addEdge(const ModelAction *from, const ModelAction *to, bool forceedge);
-       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
+       void addEdges(SnapList<ModelAction *> * edgeset, ModelAction *to);
+       void addEdge(ModelAction *from, ModelAction *to);
+       void addEdge(ModelAction *from, ModelAction *to, bool forceedge);
+       void addRMWEdge(ModelAction *from, ModelAction *rmw);
        bool checkReachable(const ModelAction *from, const ModelAction *to) const;
-
+       void freeAction(const ModelAction * act);
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpNodes(FILE *file) const;
        void dumpGraphToFile(const char *filename) const;
@@ -41,7 +41,7 @@ public:
 private:
        void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
        void putNode(const ModelAction *act, CycleNode *node);
-       CycleNode * getNode(const ModelAction *act);
+       CycleNode * getNode(ModelAction *act);
 
        /** @brief A table for mapping ModelActions to CycleNodes */
        HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
@@ -59,23 +59,31 @@ private:
  */
 class CycleNode {
 public:
-       CycleNode(const ModelAction *act);
+       CycleNode(ModelAction *act);
        void addEdge(CycleNode *node);
        CycleNode * getEdge(unsigned int i) const;
        unsigned int getNumEdges() const;
+       CycleNode * getInEdge(unsigned int i) const;
+       unsigned int getNumInEdges() const;
        bool setRMW(CycleNode *);
        CycleNode * getRMW() const;
        void clearRMW() { hasRMW = NULL; }
-       const ModelAction * getAction() const { return action; }
+       ModelAction * getAction() const { return action; }
+       void removeInEdge(CycleNode *src);
+       void removeEdge(CycleNode *dst);
+       ~CycleNode();
 
        SNAPSHOTALLOC
 private:
        /** @brief The ModelAction that this node represents */
-       const ModelAction *action;
+       ModelAction *action;
 
        /** @brief The edges leading out from this node */
        SnapVector<CycleNode *> edges;
 
+       /** @brief The edges leading in from this node */
+       SnapVector<CycleNode *> inedges;
+
        /** Pointer to a RMW node that reads from this node, or NULL, if none
         * exists */
        CycleNode *hasRMW;
@@ -83,9 +91,6 @@ private:
        /** ClockVector for this Node. */
        ClockVector *cv;
        friend class CycleGraph;
-
-       /** @brief Reference count to node. */
-       int refcount;
 };
 
 #endif /* __CYCLEGRAPH_H__ */