model: hack dumpGraph() bug by "leaking" promises

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 2647b977c23665997fa703404a8401d61b776ad6..7c9146fdda694adfd97c7f932f75822e53a4303c 100644 (file)
--- a/action.h
+++ b/action.h
@@ -80,14 +80,16 @@ public:
        void * get_location() const { return location; }
        modelclock_t get_seq_number() const { return seq_number; }
        uint64_t get_value() const { return value; }
+       uint64_t get_reads_from_value() const;
+       uint64_t get_write_value() const;
        const ModelAction * get_reads_from() const { return reads_from; }
-       const Promise * get_reads_from_promise() const { return reads_from_promise; }
+       Promise * get_reads_from_promise() const { return reads_from_promise; }
 
        Node * get_node() const;
        void set_node(Node *n) { node = n; }
 
        void set_read_from(const ModelAction *act);
-       void set_read_from_promise(const Promise *promise);
+       void set_read_from_promise(Promise *promise);
 
        /** Store the most recent fence-release from the same thread
         *  @param fence The fence-release that occured prior to this */
@@ -151,6 +153,11 @@ public:
        bool get_sleep_flag() { return sleep_flag; }
        unsigned int hash() const;
 
+       bool equals(const ModelAction *x) const { return this == x; }
+       bool equals(const Promise *x) const { return false; }
+
+       bool may_read_from(const ModelAction *write) const;
+       bool may_read_from(const Promise *promise) const;
        MEMALLOC
 private:
 
@@ -173,7 +180,7 @@ private:
        const ModelAction *reads_from;
 
        /** The promise that this action reads from. Only valid for reads */
-       const Promise *reads_from_promise;
+       Promise *reads_from_promise;
 
        /** The last fence release from the same thread */
        const ModelAction *last_fence_release;
@@ -191,6 +198,4 @@ private:
        bool sleep_flag;
 };
 
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
 #endif /* __ACTION_H__ */