remove another field

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index dc560174bee561ca9f32fcec2d11d358ab040782..fead25e649a3dfcb575e9d5aae353b4363e92d8c 100644 (file)
--- a/action.h
+++ b/action.h
@@ -11,18 +11,19 @@
 #include "mymemory.h"
 #include "memoryorder.h"
 #include "modeltypes.h"
+#include "pthread.h"
 
 /* Forward declarations */
 class ClockVector;
 class Thread;
-class Promise;
 
-namespace std {
+namespace cdsc {
        class mutex;
 }
 
 using std::memory_order;
 using std::memory_order_relaxed;
+using std::memory_order_consume;
 using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
@@ -37,16 +38,26 @@ using std::memory_order_seq_cst;
  */
 #define VALUE_NONE 0xdeadbeef
 
+/**
+ * @brief The "location" at which a fence occurs
+ *
+ * We need a non-zero memory location to associate with fences, since our hash
+ * tables don't handle NULL-pointer keys. HACK: Hopefully this doesn't collide
+ * with any legitimate memory locations.
+ */
+#define FENCE_LOCATION ((void *)0x7)
+
 /** @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 */
+       PTHREAD_CREATE,       /**< A pthread creation action */
+       PTHREAD_JOIN,         /**< A pthread join action */
+       
        ATOMIC_UNINIT,        /**< Represents an uninitialized atomic */
        ATOMIC_READ,          /**< An atomic read action */
        ATOMIC_WRITE,         /**< An atomic write action */
@@ -61,7 +72,10 @@ typedef enum action_type {
        ATOMIC_UNLOCK,        /**< An unlock action */
        ATOMIC_NOTIFY_ONE,    /**< A notify_one action */
        ATOMIC_NOTIFY_ALL,    /**< A notify all action */
-       ATOMIC_WAIT           /**< A wait action */
+       ATOMIC_WAIT,          /**< A wait action */
+       ATOMIC_ANNOTATION,     /**< An annotation action to pass information
+                                                                                                        to a trace analysis */
+       NOOP
 } action_type_t;
 
 /* Forward declaration */
@@ -85,6 +99,8 @@ public:
        thread_id_t get_tid() const { return tid; }
        action_type get_type() const { return type; }
        memory_order get_mo() const { return order; }
+       memory_order get_original_mo() const { return original_order; }
+       void set_mo(memory_order order) { this->order = order; }
        void * get_location() const { return location; }
        modelclock_t get_seq_number() const { return seq_number; }
        uint64_t get_value() const { return value; }
@@ -92,14 +108,12 @@ public:
        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;
+       cdsc::mutex * get_mutex() const;
 
        Node * get_node() const;
        void set_node(Node *n) { node = n; }
 
        void set_read_from(const ModelAction *act);
-       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 */
@@ -112,7 +126,6 @@ public:
        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;
        bool is_trylock() const;
@@ -133,6 +146,7 @@ public:
        bool is_rmw() const;
        bool is_fence() const;
        bool is_initialization() const;
+       bool is_annotation() const;
        bool is_relaxed() const;
        bool is_acquire() const;
        bool is_release() const;
@@ -161,24 +175,31 @@ public:
        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;
 
        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
+
+       void set_value(uint64_t val) { value = val; }
+
+       /* to accomodate pthread create and join */
+       Thread * thread_operand;
+       void set_thread_operand(Thread *th) { thread_operand = th; } 
 private:
 
+       const char * get_type_str() const;
+       const char * get_mo_str() const;
+
        /** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
        action_type type;
 
        /** @brief The memory order for this operation. */
        memory_order order;
 
+       /** @brief The original memory order parameter for this operation. */
+       memory_order original_order;
+
        /** @brief A pointer to the memory location for this action. */
        void *location;
 
@@ -195,13 +216,6 @@ private:
         */
        const ModelAction *reads_from;
 
-       /**
-        * @brief The promise that this action reads from
-        *
-        * Only valid for reads
-        */
-       Promise *reads_from_promise;
-
        /** @brief The last fence release from the same thread */
        const ModelAction *last_fence_release;
 
@@ -229,8 +243,6 @@ private:
         * vectors for all operations.
         */
        ClockVector *cv;
-
-       bool sleep_flag;
 };
 
 #endif /* __ACTION_H__ */