cyclegraph: mergeNodes(): return early if we violate RMW

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index f03c4ecf33496314387d99c28f19dc80f3839e27..e96e1216c0907a0af9d7e166441f960c5b782188 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,10 +28,12 @@ class CycleGraph {
        ~CycleGraph();
 
        template <typename T, typename U>
-       void addEdge(const T from, const U to);
+       bool addEdge(const T *from, const U *to);
+
+       template <typename T>
+       void addRMWEdge(const T *from, const ModelAction *rmw);
 
        bool checkForCycles() const;
-       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
        bool checkPromise(const ModelAction *from, Promise *p) const;
 
        template <typename T>
@@ -50,8 +52,10 @@ class CycleGraph {
 
        SNAPSHOTALLOC
  private:
-       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+       bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
+       void putNode(const Promise *promise, CycleNode *node);
+       void erasePromiseNode(const Promise *promise);
        CycleNode * getNode(const ModelAction *act);
        CycleNode * getNode(const Promise *promise);
        CycleNode * getNode_noCreate(const ModelAction *act) const;
@@ -102,11 +106,6 @@ class CycleNode {
        void clearRMW() { hasRMW = NULL; }
        const ModelAction * getAction() const { return action; }
        const Promise * getPromise() const { return promise; }
-
-       void popEdge() {
-               edges.pop_back();
-       }
-
        bool is_promise() const { return !action; }
        void resolvePromise(const ModelAction *writer);