cyclegraph: add full promise resolution, node merging

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index a909c10b50a49f97453bf1f6114223400b11c4ac..c0bd7d66167aea6bd71fa323efb29e18a57dfac4 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -19,12 +19,17 @@ 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:
        CycleGraph();
        ~CycleGraph();
-       void addEdge(const ModelAction *from, const ModelAction *to);
+
+       template <typename T, typename U>
+       void addEdge(const T from, const U to);
+
        bool checkForCycles() const;
        void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
        bool checkPromise(const ModelAction *from, Promise *p) const;
@@ -37,15 +42,26 @@ class CycleGraph {
        void dumpGraphToFile(const char *filename) const;
 #endif
 
+       bool resolvePromise(ModelAction *reader, ModelAction *writer,
+                       promise_list_t *mustResolve);
+
        SNAPSHOTALLOC
  private:
-       void addEdge(CycleNode *fromnode, CycleNode *tonode);
+       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
        CycleNode * getNode(const ModelAction *);
+       CycleNode * getNode(const Promise *promise);
+       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
@@ -80,12 +96,14 @@ class CycleNode {
        CycleNode * getRMW() const;
        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);
 
        SNAPSHOTALLOC
  private: