X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=63c0375211c513ef704c4ee4c3fbb8abe832fdb5;hp=30c8a35b80ed7681ce74bc5388c0667b9b4e4fec;hb=5fa2efec1354b2781ff0b29460ec8e9b8fa75991;hpb=8548c711d71b6474802af83f5a4800eb4ac30718 diff --git a/action.h b/action.h index 30c8a35b..63c03752 100644 --- a/action.h +++ b/action.h @@ -7,26 +7,58 @@ #include #include +#include -#include "threads.h" -#include "libatomic.h" #include "mymemory.h" -#include "clockvector.h" +#include "memoryorder.h" +#include "modeltypes.h" -#define VALUE_NONE -1 +class ClockVector; +class Thread; +class Promise; + +using std::memory_order; +using std::memory_order_relaxed; +using std::memory_order_acquire; +using std::memory_order_release; +using std::memory_order_acq_rel; +using std::memory_order_seq_cst; + +/** Note that this value can be legitimately used by a program, and + * hence by iteself does not indicate no value. */ +#define VALUE_NONE 0xdeadbeef + +/** 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_UNINIT, /**< Represents an uninitialized atomic */ ATOMIC_READ, /**< An atomic read action */ ATOMIC_WRITE, /**< An atomic write action */ - ATOMIC_RMW, /**< An atomic read-modify-write action */ - 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 */ + ATOMIC_NOTIFY_ONE, /**< A notify_one action */ + ATOMIC_NOTIFY_ALL, /**< A notify all action */ + ATOMIC_WAIT /**< A wait action */ } action_type_t; /* Forward declaration */ @@ -38,36 +70,71 @@ class ClockVector; */ class ModelAction { public: - ModelAction(action_type_t type, memory_order order, void *loc, int 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; } memory_order get_mo() const { return order; } void * get_location() const { return location; } modelclock_t get_seq_number() const { return seq_number; } - int get_value() const { return value; } + uint64_t get_value() const { return value; } const ModelAction * get_reads_from() const { return reads_from; } + const Promise * get_reads_from_promise() const { return reads_from_promise; } - Node * get_node() const { return node; } + Node * get_node() const; void set_node(Node *n) { node = n; } + void set_read_from(const ModelAction *act); + void set_read_from_promise(const Promise *promise); + + /** Store the most recent fence-release from the same thread + * @param fence The fence-release that occured prior to this */ + void set_last_fence_release(const ModelAction *fence) { last_fence_release = fence; } + /** @return The most recent fence-release from the same thread */ + const ModelAction * get_last_fence_release() const { return last_fence_release; } + + void copy_from_new(ModelAction *newaction); + void set_seq_number(modelclock_t num); + void set_try_lock(bool obtainedlock); + bool is_thread_start() const; + bool is_relseq_fixup() const; + bool is_mutex_op() const; + bool is_lock() const; + bool is_trylock() const; + bool is_unlock() const; + bool is_wait() 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 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_relaxed() 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; + + Thread * get_thread_operand() const; void create_cv(const ModelAction *parent = NULL); ClockVector * get_cv() const { return cv; } - void 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 { @@ -77,6 +144,15 @@ public: return get_seq_number() > act.get_seq_number(); } + 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; } MEMALLOC private: @@ -92,13 +168,18 @@ private: /** The thread id that performed this action. */ thread_id_t tid; - /** The value read or written (if RMW, then the value written). This - * should probably be something longer. */ - int value; + /** The value written (for write or RMW; undefined for read) */ + uint64_t value; /** The action that this action reads from. Only valid for reads */ const ModelAction *reads_from; + /** The promise that this action reads from. Only valid for reads */ + const Promise *reads_from_promise; + + /** The last fence release from the same thread */ + const ModelAction *last_fence_release; + /** A back reference to a Node in NodeStack, if this ModelAction is * saved on the NodeStack. */ Node *node; @@ -108,8 +189,8 @@ private: /** The clock vector stored with this action; only needed if this * action is a store release? */ ClockVector *cv; -}; -typedef std::list action_list_t; + bool sleep_flag; +}; #endif /* __ACTION_H__ */