X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=5e050810e7526408828b27c74cad76fcdef95a4b;hp=5c036ef1cf92e8376ffa7958b0c2b3660f3f3d27;hb=e60d8c23d30a0dfe66b8426f7f2ecf576e812028;hpb=16c741a1826b66ff5bb1f2b29311aa95cad08089 diff --git a/action.cc b/action.cc index 5c036ef1..5e050810 100644 --- a/action.cc +++ b/action.cc @@ -1,29 +1,104 @@ #include #define __STDC_FORMAT_MACROS #include +#include #include "model.h" #include "action.h" #include "clockvector.h" #include "common.h" +#include "threads-model.h" +#include "nodestack.h" -ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value) : +#define ACTION_INITIAL_CLOCK 0 + +/** + * @brief Construct a new ModelAction + * + * @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 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, memory_order order, void *loc, + uint64_t value, Thread *thread) : type(type), order(order), location(loc), value(value), reads_from(NULL), - cv(NULL) + node(NULL), + seq_number(ACTION_INITIAL_CLOCK), + cv(NULL), + sleep_flag(false) { - Thread *t = thread_current(); + Thread *t = thread ? thread : thread_current(); this->tid = t->get_id(); - this->seq_number = model->get_next_seq_num(); } +/** @brief ModelAction destructor */ ModelAction::~ModelAction() { - if (cv) - delete cv; + /** + * We can't free the clock vector: + * Clock vectors are snapshotting state. When we delete model actions, + * they are at the end of the node list and have invalid old clock + * vectors which have already been rolled back to an unallocated state. + */ + + /* + if (cv) + delete cv; */ +} + +void ModelAction::copy_from_new(ModelAction *newaction) +{ + seq_number = newaction->seq_number; +} + +void ModelAction::set_seq_number(modelclock_t num) +{ + ASSERT(seq_number == ACTION_INITIAL_CLOCK); + seq_number = num; +} + +bool ModelAction::is_relseq_fixup() const +{ + return type == MODEL_FIXUP_RELSEQ; +} + +bool ModelAction::is_mutex_op() const +{ + return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK; +} + +bool ModelAction::is_lock() const +{ + return type == ATOMIC_LOCK; +} + +bool ModelAction::is_unlock() const +{ + return type == ATOMIC_UNLOCK; +} + +bool ModelAction::is_trylock() const +{ + return type == ATOMIC_TRYLOCK; +} + +bool ModelAction::is_success_lock() const +{ + return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS); +} + +bool ModelAction::is_failed_trylock() const +{ + return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED); } bool ModelAction::is_read() const @@ -51,6 +126,11 @@ bool ModelAction::is_rmwc() const return type == ATOMIC_RMWC; } +bool ModelAction::is_fence() const +{ + return type == ATOMIC_FENCE; +} + bool ModelAction::is_initialization() const { return type == ATOMIC_INIT; @@ -96,8 +176,8 @@ bool ModelAction::same_thread(const ModelAction *act) const } void ModelAction::copy_typeandorder(ModelAction * act) { - this->type=act->type; - this->order=act->order; + this->type = act->type; + this->order = act->order; } /** This method changes an existing read part of an RMW action into either: @@ -125,7 +205,7 @@ void ModelAction::process_rmw(ModelAction * act) { * @param act is the action to consider exploring a reordering. * @return tells whether we have to explore a reordering. */ -bool ModelAction::is_synchronizing(const ModelAction *act) const +bool ModelAction::could_synchronize_with(const ModelAction *act) const { //Same thread can't be reordered if (same_thread(act)) @@ -137,48 +217,97 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const // Explore interleavings of seqcst writes to guarantee total order // of seq_cst operations that don't commute - if (is_write() && is_seqcst() && act->is_write() && act->is_seqcst()) + if ((is_write() || act->is_write()) && is_seqcst() && act->is_seqcst()) return true; // Explore synchronizing read/write pairs if (is_read() && is_acquire() && act->is_write() && act->is_release()) return true; - if (is_write() && is_release() && act->is_read() && act->is_acquire()) - return true; // Otherwise handle by reads_from relation return false; } -void ModelAction::create_cv(const ModelAction *parent) +bool ModelAction::is_conflicting_lock(const ModelAction *act) const { - if (cv) - delete cv; + //Must be different threads to reorder + if (same_thread(act)) + return false; + + //Try to reorder a lock past a successful lock + if (act->is_success_lock()) + return true; + + //Try to push a successful trylock past an unlock + if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS) + return true; + return false; +} + +/** + * Create a new clock vector for this action. Note that this function allows a + * user to clobber (and leak) a ModelAction's existing clock vector. A user + * should ensure that the vector has already either been rolled back + * (effectively "freed") or freed. + * + * @param parent A ModelAction from which to inherit a ClockVector + */ +void ModelAction::create_cv(const ModelAction *parent) +{ if (parent) cv = new ClockVector(parent->cv, this); else cv = new ClockVector(NULL, this); } -/** Update the model action's read_from action */ -void ModelAction::read_from(const ModelAction *act) +void ModelAction::set_try_lock(bool obtainedlock) { + if (obtainedlock) + value=VALUE_TRYSUCCESS; + else + value=VALUE_TRYFAILED; +} + +/** + * Update the model action's read_from action + * @param act The action to read from; should be a write + * @return True if this read established synchronization + */ +bool ModelAction::read_from(const ModelAction *act) { ASSERT(cv); - if (act!=NULL && act->is_release() && this->is_acquire()) { - synchronize_with(act); - } reads_from = act; + if (act != NULL && this->is_acquire()) { + rel_heads_list_t release_heads; + model->get_release_seq_heads(this, &release_heads); + int num_heads = release_heads.size(); + for (unsigned int i = 0; i < release_heads.size(); i++) + if (!synchronize_with(release_heads[i])) { + model->set_bad_synchronization(); + num_heads--; + } + return num_heads > 0; + } + return false; } /** * Synchronize the current thread with the thread corresponding to the * ModelAction parameter. * @param act The ModelAction to synchronize with + * @return True if this is a valid synchronization; false otherwise */ -void ModelAction::synchronize_with(const ModelAction *act) { - model->check_promises(cv, act->cv); +bool ModelAction::synchronize_with(const ModelAction *act) { + if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK) + return false; + model->check_promises(act->get_tid(), cv, act->cv); cv->merge(act->cv); + return true; +} + +bool ModelAction::has_synchronized_with(const ModelAction *act) const +{ + return cv->has_synchronized_with(act->cv); } /** @@ -192,10 +321,14 @@ bool ModelAction::happens_before(const ModelAction *act) const return act->cv->synchronized_since(this); } -void ModelAction::print(void) const +/** @brief Print nicely-formatted info about this ModelAction */ +void ModelAction::print() const { const char *type_str, *mo_str; switch (this->type) { + case MODEL_FIXUP_RELSEQ: + type_str = "relseq fixup"; + break; case THREAD_CREATE: type_str = "thread create"; break; @@ -208,6 +341,9 @@ void ModelAction::print(void) const case THREAD_JOIN: type_str = "thread join"; break; + case THREAD_FINISH: + type_str = "thread finish"; + break; case ATOMIC_READ: type_str = "atomic read"; break; @@ -217,6 +353,9 @@ void ModelAction::print(void) const case ATOMIC_RMW: type_str = "atomic rmw"; break; + case ATOMIC_FENCE: + type_str = "fence"; + break; case ATOMIC_RMWR: type_str = "atomic rmwr"; break; @@ -226,6 +365,15 @@ void ModelAction::print(void) const case ATOMIC_INIT: type_str = "init atomic"; break; + case ATOMIC_LOCK: + type_str = "lock"; + break; + case ATOMIC_UNLOCK: + type_str = "unlock"; + break; + case ATOMIC_TRYLOCK: + type_str = "trylock"; + break; default: type_str = "unknown type"; } @@ -255,11 +403,30 @@ void ModelAction::print(void) const printf("(%3d) Thread: %-2d Action: %-13s MO: %7s Loc: %14p Value: %-12" PRIu64, seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint); - if (reads_from) - printf(" Rf: %d", reads_from->get_seq_number()); + if (is_read()) { + if (reads_from) + printf(" Rf: %d", reads_from->get_seq_number()); + else + printf(" Rf: ?"); + } if (cv) { printf("\t"); cv->print(); } else printf("\n"); } + +/** @brief Print nicely-formatted info about this ModelAction */ +unsigned int ModelAction::hash() const +{ + unsigned int hash=(unsigned int) this->type; + hash^=((unsigned int)this->order)<<3; + hash^=seq_number<<5; + hash^=tid<<6; + + if (is_read()) { + if (reads_from) + hash^=reads_from->get_seq_number(); + } + return hash; +}