X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=d65695446486e58a929196335660d8c3172cb94d;hp=9c0e29920e362f5d2a2fa7d3681077dad4b7690a;hb=829aac4055269992c26fed5530cfdaf59775b2a9;hpb=995962127d29a128fa2de578f47953308600b605 diff --git a/action.cc b/action.cc index 9c0e2992..d6569544 100644 --- a/action.cc +++ b/action.cc @@ -8,7 +8,6 @@ #include "clockvector.h" #include "common.h" #include "threads-model.h" -#include "nodestack.h" #include "wildcard.h" #define ACTION_INITIAL_CLOCK 0 @@ -34,10 +33,14 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, Thread *thread) : location(loc), + position(NULL), reads_from(NULL), last_fence_release(NULL), - node(NULL), cv(NULL), + rf_cv(NULL), + trace_ref(NULL), + thrdmap_ref(NULL), + action_ref(NULL), value(value), type(type), order(order), @@ -45,13 +48,43 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, seq_number(ACTION_INITIAL_CLOCK) { /* References to NULL atomic variables can end up here */ - ASSERT(loc || type == ATOMIC_FENCE); + ASSERT(loc || type == ATOMIC_FENCE || type == ATOMIC_NOP); Thread *t = thread ? thread : thread_current(); - this->tid = t->get_id(); + this->tid = t!= NULL ? t->get_id() : -1; } +/** + * @brief Construct a new ModelAction for sleep actions + * + * @param type The type of action: THREAD_SLEEP + * @param order The memory order of this action. A "don't care" for non-ATOMIC + * actions (e.g., THREAD_* or MODEL_* actions). + * @param loc The location that this action acts upon + * @param value The time duration a thread is scheduled to sleep. + * @param _time The this sleep action is constructed + */ +ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value, uint64_t _time) : + location(NULL), + position(NULL), + time(_time), + last_fence_release(NULL), + cv(NULL), + rf_cv(NULL), + trace_ref(NULL), + thrdmap_ref(NULL), + action_ref(NULL), + value(value), + type(type), + order(order), + original_order(order), + seq_number(ACTION_INITIAL_CLOCK) +{ + Thread *t = thread_current(); + this->tid = t!= NULL ? t->get_id() : -1; +} + /** * @brief Construct a new ModelAction * @@ -67,10 +100,14 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, int size) : location(loc), + position(NULL), reads_from(NULL), last_fence_release(NULL), - node(NULL), cv(NULL), + rf_cv(NULL), + trace_ref(NULL), + thrdmap_ref(NULL), + action_ref(NULL), value(value), type(type), order(order), @@ -84,6 +121,82 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, this->tid = t->get_id(); } + +/** + * @brief Construct a new ModelAction with source line number (requires llvm support) + * + * @param type The type of action + * @param order The memory order of this action. A "don't care" for non-ATOMIC + * actions (e.g., THREAD_* or MODEL_* actions). + * @param loc The location that this action acts upon + * @param value (optional) A value associated with the action (e.g., the value + * read or written). Defaults to a given macro constant, for debugging purposes. + * @param size (optional) The Thread in which this action occurred. If NULL + * (default), then a Thread is assigned according to the scheduler. + */ +ModelAction::ModelAction(action_type_t type, const char * position, memory_order order, void *loc, + uint64_t value, int size) : + location(loc), + position(position), + reads_from(NULL), + last_fence_release(NULL), + cv(NULL), + rf_cv(NULL), + trace_ref(NULL), + thrdmap_ref(NULL), + action_ref(NULL), + value(value), + type(type), + order(order), + original_order(order), + seq_number(ACTION_INITIAL_CLOCK) +{ + /* References to NULL atomic variables can end up here */ + ASSERT(loc); + this->size = size; + Thread *t = thread_current(); + this->tid = t->get_id(); +} + + +/** + * @brief Construct a new ModelAction with source line number (requires llvm support) + * + * @param type The type of action + * @param position The source line number of this atomic operation + * @param order The memory order of this action. A "don't care" for non-ATOMIC + * actions (e.g., THREAD_* or MODEL_* actions). + * @param loc The location that this action acts upon + * @param value (optional) A value associated with the action (e.g., the value + * read or written). Defaults to a given macro constant, for debugging purposes. + * @param thread (optional) The Thread in which this action occurred. If NULL + * (default), then a Thread is assigned according to the scheduler. + */ +ModelAction::ModelAction(action_type_t type, const char * position, memory_order order, + void *loc, uint64_t value, Thread *thread) : + location(loc), + position(position), + reads_from(NULL), + last_fence_release(NULL), + cv(NULL), + rf_cv(NULL), + trace_ref(NULL), + thrdmap_ref(NULL), + action_ref(NULL), + value(value), + type(type), + order(order), + original_order(order), + seq_number(ACTION_INITIAL_CLOCK) +{ + /* References to NULL atomic variables can end up here */ + ASSERT(loc || type == ATOMIC_FENCE); + + Thread *t = thread ? thread : thread_current(); + this->tid = t->get_id(); +} + + /** @brief ModelAction destructor */ ModelAction::~ModelAction() { @@ -110,12 +223,15 @@ void ModelAction::copy_from_new(ModelAction *newaction) void ModelAction::set_seq_number(modelclock_t num) { - /* ATOMIC_UNINIT actions should never have non-zero clock */ - ASSERT(!is_uninitialized()); ASSERT(seq_number == ACTION_INITIAL_CLOCK); seq_number = num; } +void ModelAction::reset_seq_number() +{ + seq_number = 0; +} + bool ModelAction::is_thread_start() const { return type == THREAD_START; @@ -128,7 +244,7 @@ bool ModelAction::is_thread_join() const bool ModelAction::is_mutex_op() const { - return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL; + return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL; } bool ModelAction::is_lock() const @@ -136,8 +252,13 @@ bool ModelAction::is_lock() const return type == ATOMIC_LOCK; } +bool ModelAction::is_sleep() const +{ + return type == THREAD_SLEEP; +} + bool ModelAction::is_wait() const { - return type == ATOMIC_WAIT; + return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT; } bool ModelAction::is_notify() const { @@ -174,11 +295,6 @@ bool ModelAction::is_atomic_var() const return is_read() || could_be_write(); } -bool ModelAction::is_uninitialized() const -{ - return type == ATOMIC_UNINIT; -} - bool ModelAction::is_read() const { return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW; @@ -186,7 +302,17 @@ bool ModelAction::is_read() const bool ModelAction::is_write() const { - return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT; + return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == NONATOMIC_WRITE; +} + +bool ModelAction::is_create() const +{ + return type == THREAD_CREATE || type == PTHREAD_CREATE; +} + +bool ModelAction::is_free() const +{ + return type == READY_FREE; } bool ModelAction::could_be_write() const @@ -465,6 +591,7 @@ uint64_t ModelAction::get_reads_from_value() const ASSERT(is_read()); if (reads_from) return reads_from->get_write_value(); + return VALUE_NONE; // Only for new actions with no reads-from } @@ -505,37 +632,15 @@ uint64_t ModelAction::get_return_value() const return value; } -/** @return The Node associated with this ModelAction */ -Node * ModelAction::get_node() const -{ - /* UNINIT actions do not have a Node */ - ASSERT(!is_uninitialized()); - return node; -} - /** * Update the model action's read_from action * @param act The action to read from; should be a write */ -void ModelAction::set_read_from(const ModelAction *act) +void ModelAction::set_read_from(ModelAction *act) { ASSERT(act); reads_from = act; - - if (act->is_uninitialized()) { // WL - uint64_t val = *((uint64_t *) location); - ModelAction * act_initialized = (ModelAction *)act; - act_initialized->set_value(val); - reads_from = (const ModelAction *)act_initialized; - -// disabled by WL, because LLVM IR is unable to detect atomic init -/* model->assert_bug("May read from uninitialized atomic:\n" - " action %d, thread %d, location %p (%s, %s)", - seq_number, id_to_int(tid), location, - get_type_str(), get_mo_str()); - */ - } } /** @@ -576,11 +681,13 @@ const char * ModelAction::get_type_str() const case THREAD_YIELD: return "thread yield"; case THREAD_JOIN: return "thread join"; case THREAD_FINISH: return "thread finish"; + case THREAD_SLEEP: return "thread sleep"; + case THREADONLY_FINISH: return "pthread_exit finish"; case PTHREAD_CREATE: return "pthread create"; case PTHREAD_JOIN: return "pthread join"; - case ATOMIC_UNINIT: return "uninitialized"; + case NONATOMIC_WRITE: return "nonatomic write"; case ATOMIC_READ: return "atomic read"; case ATOMIC_WRITE: return "atomic write"; case ATOMIC_RMW: return "atomic rmw"; @@ -593,6 +700,7 @@ const char * ModelAction::get_type_str() const case ATOMIC_UNLOCK: return "unlock"; case ATOMIC_TRYLOCK: return "trylock"; case ATOMIC_WAIT: return "wait"; + case ATOMIC_TIMEDWAIT: return "timed wait"; case ATOMIC_NOTIFY_ONE: return "notify one"; case ATOMIC_NOTIFY_ALL: return "notify all"; case ATOMIC_ANNOTATION: return "annotation";