model: schedule appropriate fence backtracking points

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index f812e24d4986abef6c45780a897e44bcb27bffe0..bb2ab2d87b4370065ff64fa9dfcac45e86f2ce39 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -19,6 +19,8 @@ class Promise;
 class CycleNode;
 class ModelAction;
 
+typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
+
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
@@ -26,12 +28,17 @@ 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;
-       bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+       template <typename T, typename U>
+       bool checkReachable(const T *from, const U *to) const;
+
        void startChanges();
        void commitChanges();
        void rollbackChanges();
@@ -40,15 +47,30 @@ class CycleGraph {
        void dumpGraphToFile(const char *filename) const;
 #endif
 
+       bool resolvePromise(ModelAction *reader, ModelAction *writer,
+                       promise_list_t *mustResolve);
+
        SNAPSHOTALLOC
  private:
-       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+       bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
-       CycleNode * getNode(const ModelAction *);
+       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;
+       CycleNode * getNode_noCreate(const Promise *promise) const;
+       bool mergeNodes(CycleNode *node1, CycleNode *node2,
+                       promise_list_t *mustMerge);
+
        HashTable<const CycleNode *, const 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;
+       /** @brief A table for mapping reader ModelActions to Promise
+        *  CycleNodes */
+       HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> readerToPromiseNode;
+
 #if SUPPORT_MOD_ORDER_DUMP
        std::vector<CycleNode *> nodeList;
 #endif
@@ -83,12 +105,9 @@ class CycleNode {
        CycleNode * getRMW() const;
        void clearRMW() { hasRMW = NULL; }
        const ModelAction * getAction() const { return action; }
-
-       void popEdge() {
-               edges.pop_back();
-       }
-
+       const Promise * getPromise() const { return promise; }
        bool is_promise() const { return !action; }
+       void resolvePromise(const ModelAction *writer);
 
        SNAPSHOTALLOC
  private: