action: print promise number, not just ?

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index f03c4ecf33496314387d99c28f19dc80f3839e27..1af54c77818bde954d784eb925cc56adc2013fd4 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,14 +28,16 @@ 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>
-       bool checkReachable(const ModelAction *from, const T *to) const;
+       template <typename T, typename U>
+       bool checkReachable(const T *from, const U *to) const;
 
        void startChanges();
        void commitChanges();
@@ -45,13 +47,15 @@ class CycleGraph {
        void dumpGraphToFile(const char *filename) const;
 #endif
 
-       bool resolvePromise(ModelAction *reader, ModelAction *writer,
+       bool resolvePromise(const Promise *promise, 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);
+       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;
@@ -63,9 +67,8 @@ class CycleGraph {
 
        /** @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;
+       /** @brief A table for mapping Promises to CycleNodes */
+       HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
 
 #if SUPPORT_MOD_ORDER_DUMP
        std::vector<CycleNode *> nodeList;
@@ -102,11 +105,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);