more changes towards locks

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 36cec25dcf05cd9d24e971b22c6626e64585bde4..753860984a2f2df79869deb11bb0053fdb05d7a5 100644 (file)
--- a/action.h
+++ b/action.h
@@ -24,6 +24,8 @@ using std::memory_order_seq_cst;
                hence by iteself does not indicate no value. */
 
 #define VALUE_NONE 1234567890
+#define VALUE_TRYSUCCESS 1
+#define VALUE_TRYFAILED 0
 
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
@@ -32,11 +34,18 @@ typedef enum action_type {
        THREAD_START,         /**< First action in each thread */
        THREAD_YIELD,         /**< A thread yield action */
        THREAD_JOIN,          /**< A thread join action */
+       THREAD_FINISH,        /**< A thread completion action */
        ATOMIC_READ,          /**< An atomic read action */
        ATOMIC_WRITE,         /**< An atomic write action */
-       ATOMIC_RMW,           /**< An atomic read-modify-write action */
-       ATOMIC_INIT           /**< Initialization of an atomic object (e.g.,
+       ATOMIC_RMWR,          /**< The read part of an atomic RMW action */
+       ATOMIC_RMW,           /**< The write part of an atomic RMW action */
+       ATOMIC_RMWC,          /**< Convert an atomic RMW action into a READ */
+       ATOMIC_INIT,          /**< Initialization of an atomic object (e.g.,
                               *   atomic_init()) */
+       ATOMIC_FENCE,
+       ATOMIC_LOCK,
+       ATOMIC_TRYLOCK,
+       ATOMIC_UNLOCK
 } action_type_t;
 
 /* Forward declaration */
@@ -63,9 +72,14 @@ public:
        Node * get_node() const { return node; }
        void set_node(Node *n) { node = n; }
 
+       bool is_success_lock() const;
+       bool is_failed_trylock() const;
        bool is_read() const;
        bool is_write() const;
+       bool is_rmwr() const;
+       bool is_rmwc() const;
        bool is_rmw() const;
+       bool is_fence() const;
        bool is_initialization() const;
        bool is_acquire() const;
        bool is_release() const;
@@ -77,7 +91,9 @@ public:
        void create_cv(const ModelAction *parent = NULL);
        ClockVector * get_cv() const { return cv; }
        void read_from(const ModelAction *act);
+       void synchronize_with(const ModelAction *act);
 
+       bool has_synchronized_with(const ModelAction *act) const;
        bool happens_before(const ModelAction *act) const;
 
        inline bool operator <(const ModelAction& act) const {
@@ -87,7 +103,8 @@ public:
                return get_seq_number() > act.get_seq_number();
        }
 
-       void upgrade_rmw(ModelAction * act);
+       void process_rmw(ModelAction * act);
+       void copy_typeandorder(ModelAction * act);
 
        MEMALLOC
 private: