X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=cebbec1beb6ba7d3f409673e92a214b792c8e623;hb=bac8bc0661e904fc2b1b9aba07d239679483b2b4;hp=de5bca9050c26bf1c38940f0acb18401cb6b6919;hpb=38c72a8748ae74a5bb8b75e713f363a49b48e7af;p=c11tester.git diff --git a/action.h b/action.h index de5bca90..cebbec1b 100644 --- a/action.h +++ b/action.h @@ -11,11 +11,11 @@ #include "mymemory.h" #include "memoryorder.h" #include "modeltypes.h" -#include "pthread.h" +#include "mypthread.h" #include "classlist.h" namespace cdsc { - class mutex; +class mutex; } using std::memory_order; @@ -47,32 +47,30 @@ using std::memory_order_seq_cst; /** @brief Represents an action type, identifying one of several types of * ModelAction */ typedef enum action_type { - 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 */ - 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 */ - ATOMIC_NOTIFY_ONE, /**< A notify_one action */ - ATOMIC_NOTIFY_ALL, /**< A notify all action */ - ATOMIC_WAIT, /**< A wait action */ - ATOMIC_ANNOTATION, /**< An annotation action to pass information - to a trace analysis */ - NOOP + 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 + 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., atomic_init()) + ATOMIC_FENCE, // < A fence action + ATOMIC_LOCK, // < A lock action + ATOMIC_TRYLOCK, // < A trylock action + 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_ANNOTATION, // < An annotation action to pass information to a trace analysis + NOOP // no operation, which returns control to scheduler } action_type_t; @@ -87,6 +85,8 @@ typedef enum action_type { 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(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL); ~ModelAction(); void print() const; @@ -96,6 +96,7 @@ public: memory_order get_original_mo() const { return original_order; } void set_mo(memory_order order) { this->order = order; } void * get_location() const { return location; } + const char * get_position() const { return position; } modelclock_t get_seq_number() const { return seq_number; } uint64_t get_value() const { return value; } uint64_t get_reads_from_value() const; @@ -136,6 +137,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; @@ -149,9 +151,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); ClockVector * get_cv() const { return cv; } bool synchronize_with(const ModelAction *act); @@ -168,47 +169,33 @@ public: void process_rmw(ModelAction * act); void copy_typeandorder(ModelAction * act); - unsigned int hash() const; - bool equals(const ModelAction *x) const { return this == x; } - - 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; } + void set_thread_operand(Thread *th) { thread_operand = th; } + SNAPSHOTALLOC 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; - /** @brief The thread id that performed this action. */ - thread_id_t tid; - - /** @brief The value written (for write or RMW; undefined for read) */ - uint64_t value; + /** @brief A pointer to the source line for this atomic action. */ + const char * position; - /** - * @brief The store that this action reads from - * - * Only valid for reads - */ - const ModelAction *reads_from; + 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; @@ -221,14 +208,6 @@ private: */ Node *node; - /** - * @brief The sequence number of this action - * - * Except for ATOMIC_UNINIT actions, this number should be unique and - * should represent the action's position in the execution order. - */ - modelclock_t seq_number; - /** * @brief The clock vector for this operation * @@ -237,6 +216,29 @@ private: * vectors for all operations. */ ClockVector *cv; + + /** @brief The value written (for write or RMW; undefined for read) */ + uint64_t value; + + /** @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 The thread id that performed this action. */ + thread_id_t tid; + + /** + * @brief The sequence number of this action + * + * Except for ATOMIC_UNINIT actions, this number should be unique and + * should represent the action's position in the execution order. + */ + modelclock_t seq_number; }; -#endif /* __ACTION_H__ */ +#endif /* __ACTION_H__ */