fix some of the bugs related to barrier example...

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 5ab36b360ffd0bd3889f456a53e61f6c9cfe7712..4f63c181b0a3f2fca0a798fead208029af4a364b 100644 (file)
--- a/action.h
+++ b/action.h
@@ -7,11 +7,14 @@
 
 #include <list>
 #include <cstddef>
+#include <inttypes.h>
 
-#include "threads.h"
 #include "mymemory.h"
-#include "clockvector.h"
 #include "memoryorder.h"
+#include "modeltypes.h"
+
+class ClockVector;
+class Thread;
 
 using std::memory_order;
 using std::memory_order_relaxed;
@@ -25,20 +28,34 @@ using std::memory_order_seq_cst;
 
 #define VALUE_NONE 1234567890
 
+/** 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 {
+       MODEL_FIXUP_RELSEQ,   /**< Special ModelAction: finalize a release
+                              *   sequence */
        THREAD_CREATE,        /**< A thread creation action */
        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_RMWR,          /**< The read of an atomic read-modify-write action */
-       ATOMIC_RMW,           /**< The write of an atomic read-modify-write action */
-       ATOMIC_RMWC,          /**< Terminate an atomic read-modify-write action w/o write */
-       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,         /**< A fence action */
+       ATOMIC_LOCK,          /**< A lock action */
+       ATOMIC_TRYLOCK,       /**< A trylock action */
+       ATOMIC_UNLOCK         /**< An unlock action */
 } action_type_t;
 
 /* Forward declaration */
@@ -50,9 +67,9 @@ class ClockVector;
  */
 class ModelAction {
 public:
-       ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
+       ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
        ~ModelAction();
-       void print(void) const;
+       void print() const;
 
        thread_id_t get_tid() const { return tid; }
        action_type get_type() const { return type; }
@@ -65,23 +82,38 @@ public:
        Node * get_node() const { return node; }
        void set_node(Node *n) { node = n; }
 
+       void copy_from_new(ModelAction *newaction);
+       void set_seq_number(modelclock_t num);
+       void set_try_lock(bool obtainedlock);
+       bool is_relseq_fixup() const;
+       bool is_mutex_op() const;
+       bool is_lock() const;
+       bool is_trylock() const;
+       bool is_unlock() const;
+       bool is_success_lock() const;
+       bool is_failed_trylock() const;
        bool is_read() const;
        bool is_write() const;
+       bool could_be_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;
        bool is_seqcst() const;
        bool same_var(const ModelAction *act) const;
        bool same_thread(const ModelAction *act) const;
-       bool is_synchronizing(const ModelAction *act) const;
+       bool is_conflicting_lock(const ModelAction *act) const;
+       bool could_synchronize_with(const ModelAction *act) const;
 
        void create_cv(const ModelAction *parent = NULL);
        ClockVector * get_cv() const { return cv; }
-       void read_from(const ModelAction *act);
+       bool read_from(const ModelAction *act);
+       bool 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 {
@@ -91,7 +123,12 @@ public:
                return get_seq_number() > act.get_seq_number();
        }
 
-       void upgrade_rmw(ModelAction * act);
+       void process_rmw(ModelAction * act);
+       void copy_typeandorder(ModelAction * act);
+
+       void set_sleep_flag() { sleep_flag=true; }
+       bool get_sleep_flag() { return sleep_flag; }
+       unsigned int hash() const;
 
        MEMALLOC
 private:
@@ -123,8 +160,10 @@ private:
        /** The clock vector stored with this action; only needed if this
         * action is a store release? */
        ClockVector *cv;
+
+       bool sleep_flag;
 };
 
-typedef std::list<ModelAction *> action_list_t;
+typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
 
 #endif /* __ACTION_H__ */