cyclegraph: RMW atomicity violation must flag a cycle

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index 45e49fb7bec3950656054e02f92b06aa5cf3ae65..5f6974b9033f3950af16f7108270bc427c2c9ce5 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -26,7 +26,6 @@ class CycleGraph {
        ~CycleGraph();
        void addEdge(const ModelAction *from, const ModelAction *to);
        bool checkForCycles() const;
-       bool checkForRMWViolation() const;
        void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
        bool checkPromise(const ModelAction *from, Promise *p) const;
        bool checkReachable(const ModelAction *from, const ModelAction *to) const;
@@ -40,6 +39,7 @@ class CycleGraph {
 
        SNAPSHOTALLOC
  private:
+       void addEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
        CycleNode * getNode(const ModelAction *);
        HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
@@ -56,9 +56,6 @@ class CycleGraph {
        bool hasCycles;
        bool oldCycles;
 
-       bool hasRMWViolation;
-       bool oldRMWViolation;
-
        std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
        std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
 };