Fix RMW bug

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 06d76c25ebeac93c231da9c68609ea3d57b04c2b..760e9fb0409143764260103566316525e06ac79c 100644 (file)
--- a/action.h
+++ b/action.h
@@ -11,11 +11,8 @@
 #include "mymemory.h"
 #include "memoryorder.h"
 #include "modeltypes.h"
-#include "pthread.h"
-
-/* Forward declarations */
-class ClockVector;
-class Thread;
+#include "mypthread.h"
+#include "classlist.h"
 
 namespace cdsc {
        class mutex;
@@ -50,8 +47,6 @@ using std::memory_order_seq_cst;
 /** @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 */
@@ -64,6 +59,7 @@ typedef enum action_type {
        ATOMIC_READ,          /**< An atomic read action */
        ATOMIC_WRITE,         /**< An atomic write action */
        ATOMIC_RMWR,          /**< The read part of an atomic RMW action */
+       ATOMIC_RMWRCAS,          /**< 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.,
@@ -80,9 +76,6 @@ typedef enum action_type {
        NOOP
 } action_type_t;
 
-/* Forward declaration */
-class Node;
-class ClockVector;
 
 /**
  * @brief Represents a single atomic action
@@ -95,6 +88,7 @@ class ClockVector;
 class ModelAction {
 public:
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
+       ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, int size);
        ~ModelAction();
        void print() const;
 
@@ -128,7 +122,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;
@@ -145,6 +138,7 @@ public:
        bool is_yield() const;
        bool could_be_write() const;
        bool is_rmwr() const;
+       bool is_rmwrcas() const;
        bool is_rmwc() const;
        bool is_rmw() const;
        bool is_fence() const;
@@ -158,7 +152,8 @@ public:
        bool same_thread(const ModelAction *act) const;
        bool is_conflicting_lock(const ModelAction *act) const;
        bool could_synchronize_with(const ModelAction *act) const;
-
+  int getSize() const;
+  
        Thread * get_thread_operand() const;
 
        void create_cv(const ModelAction *parent = NULL);
@@ -178,13 +173,10 @@ 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 may_read_from(const ModelAction *write) const;
        MEMALLOC
 
        void set_value(uint64_t val) { value = val; }
@@ -215,13 +207,15 @@ private:
        /** @brief The value written (for write or RMW; undefined for read) */
        uint64_t value;
 
-       /**
+  union {
+  /**
         * @brief The store that this action reads from
         *
         * Only valid for reads
         */
        const ModelAction *reads_from;
-
+    int size;
+  };
        /** @brief The last fence release from the same thread */
        const ModelAction *last_fence_release;
 
@@ -249,8 +243,6 @@ private:
         * vectors for all operations.
         */
        ClockVector *cv;
-
-       bool sleep_flag;
 };
 
 #endif /* __ACTION_H__ */