threads: move circular wait check into Threads::is_waiting_on

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 87939f8c73512e84496016a3fe399edede067907..61c7c4cb9f7b5c7ffc15d270792ad856cdfe80e8 100644 (file)
--- a/action.h
+++ b/action.h
@@ -5,7 +5,6 @@
 #ifndef __ACTION_H__
 #define __ACTION_H__
 
-#include <list>
 #include <cstddef>
 #include <inttypes.h>
 
@@ -17,6 +16,10 @@ class ClockVector;
 class Thread;
 class Promise;
 
+namespace std {
+       class mutex;
+}
+
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_acquire;
@@ -80,8 +83,12 @@ 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;
+       uint64_t get_return_value() const;
        const ModelAction * get_reads_from() const { return reads_from; }
        Promise * get_reads_from_promise() const { return reads_from_promise; }
+       std::mutex * get_mutex() const;
 
        Node * get_node() const;
        void set_node(Node *n) { node = n; }
@@ -113,6 +120,7 @@ public:
        bool is_uninitialized() const;
        bool is_read() const;
        bool is_write() const;
+       bool is_yield() const;
        bool could_be_write() const;
        bool is_rmwr() const;
        bool is_rmwc() const;
@@ -153,6 +161,9 @@ public:
 
        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: