action: refactor, move VALUE_TRY{SUCCESS,FAILED} out of header

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 8a3650b64c8e1ad8103d6767522a4aa36c56f879..46e8273e467ab3950bedd71adffbf46ce259860f 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;
@@ -28,12 +31,6 @@ using std::memory_order_seq_cst;
  *  hence by iteself does not indicate no value. */
 #define VALUE_NONE 0xdeadbeef
 
-/** A special value to represent a successful trylock */
-#define VALUE_TRYSUCCESS 1
-
-/** A special value to represent a failed trylock */
-#define VALUE_TRYFAILED 0
-
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {
@@ -81,8 +78,11 @@ public:
        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; }
@@ -100,6 +100,7 @@ public:
        void set_seq_number(modelclock_t num);
        void set_try_lock(bool obtainedlock);
        bool is_thread_start() const;
+       bool is_thread_join() const;
        bool is_relseq_fixup() const;
        bool is_mutex_op() const;
        bool is_lock() const;
@@ -114,6 +115,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;
@@ -154,6 +156,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: