X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=c5ba6d7dda9f9593a315a26c3d1da336a50b5a0f;hp=8a7743ff7f2c5cac90413d5e96ff137a2817f1c5;hb=15ea44894415d4b1150728658d65c641556e5fcf;hpb=bbc0bd0561362e1cb93c04fddc165b49d83c24ed diff --git a/action.h b/action.h index 8a7743ff..c5ba6d7d 100644 --- a/action.h +++ b/action.h @@ -34,6 +34,7 @@ using std::memory_order_seq_cst; * iteself does not indicate no value. */ #define VALUE_NONE 0xdeadbeef +#define WRITE_REFERENCED ((void *)0x1) /** * @brief The "location" at which a fence occurs @@ -58,7 +59,6 @@ typedef enum action_type { PTHREAD_CREATE, // < A pthread creation action PTHREAD_JOIN, // < A pthread join action - ATOMIC_UNINIT, // < Represents an uninitialized atomic NONATOMIC_WRITE, // < Represents a non-atomic store ATOMIC_INIT, // < Initialization of an atomic object (e.g., atomic_init()) ATOMIC_WRITE, // < An atomic write action @@ -78,6 +78,8 @@ typedef enum action_type { ATOMIC_WAIT, // < A wait action ATOMIC_TIMEDWAIT, // < A timed wait action ATOMIC_ANNOTATION, // < An annotation action to pass information to a trace analysis + READY_FREE, // < Write is ready to be freed + ATOMIC_NOP // < Placeholder } action_type_t; @@ -85,8 +87,8 @@ typedef enum action_type { * @brief Represents a single atomic action * * A ModelAction is always allocated as non-snapshotting, because it is used in - * multiple executions during backtracking. Except for fake uninitialized - * (ATOMIC_UNINIT) ModelActions, each action is assigned a unique sequence + * multiple executions during backtracking. Except for non-atomic write + * ModelActions, each action is assigned a unique sequence * number. */ class ModelAction { @@ -101,6 +103,8 @@ public: thread_id_t get_tid() const { return tid; } action_type get_type() const { return type; } + void set_type(action_type _type) { type = _type; } + void set_free() { type = READY_FREE; } 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; } @@ -135,14 +139,15 @@ public: bool is_trylock() const; bool is_unlock() const; bool is_wait() const; + bool is_create() const; bool is_notify() const; bool is_notify_one() const; bool is_success_lock() const; bool is_failed_trylock() const; bool is_atomic_var() const; - bool is_uninitialized() const; bool is_read() const; bool is_write() const; + bool is_free() const; bool is_yield() const; bool could_be_write() const; bool is_rmwr() const; @@ -187,8 +192,7 @@ public: /* to accomodate pthread create and join */ Thread * thread_operand; void set_thread_operand(Thread *th) { thread_operand = th; } - void set_uninit_action(ModelAction *act) { uninitaction = act; } - ModelAction * get_uninit_action() { return uninitaction; } + SNAPSHOTALLOC private: const char * get_type_str() const; @@ -213,7 +217,6 @@ private: /** @brief The last fence release from the same thread */ const ModelAction *last_fence_release; - ModelAction * uninitaction; /** * @brief The clock vector for this operation @@ -243,7 +246,7 @@ private: /** * @brief The sequence number of this action * - * Except for ATOMIC_UNINIT actions, this number should be unique and + * Except for non atomic write actions, this number should be unique and * should represent the action's position in the execution order. */ modelclock_t seq_number;