X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=576f78a54bf6f27c79a89733de53e6a5d74c4990;hb=b385a968b6b2f2695cceafcba62abcb398f41bb2;hp=09352da0b0f30f030c5fb423ddd5d60dfdb5dd0c;hpb=5e1443be9f872684a7b40093198bd020a9a2f0bf;p=model-checker.git diff --git a/action.cc b/action.cc index 09352da..576f78a 100644 --- a/action.cc +++ b/action.cc @@ -7,7 +7,8 @@ #include "action.h" #include "clockvector.h" #include "common.h" -#include "threads.h" +#include "threads-model.h" +#include "nodestack.h" #define ACTION_INITIAL_CLOCK 0 @@ -30,9 +31,15 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, location(loc), value(value), reads_from(NULL), + last_fence_release(NULL), + node(NULL), seq_number(ACTION_INITIAL_CLOCK), - cv(NULL) + cv(NULL), + sleep_flag(false) { + /* References to NULL atomic variables can end up here */ + ASSERT(loc || type == ATOMIC_FENCE || type == MODEL_FIXUP_RELSEQ); + Thread *t = thread ? thread : thread_current(); this->tid = t->get_id(); } @@ -59,10 +66,17 @@ 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; } +bool ModelAction::is_thread_start() const +{ + return type == THREAD_START; +} + bool ModelAction::is_relseq_fixup() const { return type == MODEL_FIXUP_RELSEQ; @@ -70,7 +84,7 @@ bool ModelAction::is_relseq_fixup() const bool ModelAction::is_mutex_op() const { - return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK; + return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL; } bool ModelAction::is_lock() const @@ -78,6 +92,18 @@ bool ModelAction::is_lock() const return type == ATOMIC_LOCK; } +bool ModelAction::is_wait() const { + return type == ATOMIC_WAIT; +} + +bool ModelAction::is_notify() const { + return type==ATOMIC_NOTIFY_ONE || type==ATOMIC_NOTIFY_ALL; +} + +bool ModelAction::is_notify_one() const { + return type==ATOMIC_NOTIFY_ONE; +} + bool ModelAction::is_unlock() const { return type == ATOMIC_UNLOCK; @@ -98,6 +124,11 @@ bool ModelAction::is_failed_trylock() const return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED); } +bool ModelAction::is_uninitialized() const +{ + return type == ATOMIC_UNINIT; +} + bool ModelAction::is_read() const { return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW; @@ -105,7 +136,12 @@ bool ModelAction::is_read() const bool ModelAction::is_write() const { - return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT; + return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT; +} + +bool ModelAction::could_be_write() const +{ + return is_write() || is_rmwr(); } bool ModelAction::is_rmwr() const @@ -133,6 +169,11 @@ bool ModelAction::is_initialization() const return type == ATOMIC_INIT; } +bool ModelAction::is_relaxed() const +{ + return order == std::memory_order_relaxed; +} + bool ModelAction::is_acquire() const { switch (order) { @@ -164,6 +205,19 @@ bool ModelAction::is_seqcst() const bool ModelAction::same_var(const ModelAction *act) const { + if ( act->is_wait() || is_wait() ) { + if ( act->is_wait() && is_wait() ) { + if ( ((void *)value) == ((void *)act->value) ) + return true; + } else if ( is_wait() ) { + if ( ((void *)value) == act->location ) + return true; + } else if ( act->is_wait() ) { + if ( location == ((void *)act->value) ) + return true; + } + } + return location == act->location; } @@ -212,13 +266,36 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const if (!same_var(act)) return false; - // Explore interleavings of seqcst writes to guarantee total order - // of seq_cst operations that don't commute - if ((is_write() || act->is_write()) && is_seqcst() && act->is_seqcst()) + // Explore interleavings of seqcst writes/fences to guarantee total + // order of seq_cst operations that don't commute + if ((could_be_write() || act->could_be_write() || is_fence() || act->is_fence()) + && is_seqcst() && act->is_seqcst()) + return true; + + // Explore synchronizing read/write/fence pairs + if (is_acquire() && act->is_release() && (is_read() || is_fence()) && + (act->could_be_write() || act->is_fence())) + return true; + + //lock just released...we can grab lock + if ((is_lock() ||is_trylock()) && (act->is_unlock()||act->is_wait())) return true; - // Explore synchronizing read/write pairs - if (is_read() && is_acquire() && act->is_write() && act->is_release()) + //lock just acquired...we can fail to grab lock + if (is_trylock() && act->is_success_lock()) + return true; + + //other thread stalling on lock...we can release lock + if (is_unlock() && (act->is_trylock()||act->is_lock())) + return true; + + if (is_trylock() && (act->is_unlock()||act->is_wait())) + return true; + + if ( is_notify() && act->is_wait() ) + return true; + + if ( is_wait() && act->is_notify() ) return true; // Otherwise handle by reads_from relation @@ -239,6 +316,10 @@ bool ModelAction::is_conflicting_lock(const ModelAction *act) const if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS) return true; + //Try to push a successful trylock past a wait + if (act->is_wait() && is_trylock() && value == VALUE_TRYSUCCESS) + return true; + return false; } @@ -268,24 +349,12 @@ void ModelAction::set_try_lock(bool obtainedlock) { /** * 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) +void ModelAction::set_read_from(const ModelAction *act) { - ASSERT(cv); 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; + if (act && act->is_uninitialized()) + model->assert_bug("May read from uninitialized atomic\n"); } /** @@ -304,7 +373,7 @@ bool ModelAction::synchronize_with(const ModelAction *act) { bool ModelAction::has_synchronized_with(const ModelAction *act) const { - return cv->has_synchronized_with(act->cv); + return cv->synchronized_since(act); } /** @@ -341,6 +410,9 @@ void ModelAction::print() const case THREAD_FINISH: type_str = "thread finish"; break; + case ATOMIC_UNINIT: + type_str = "uninitialized"; + break; case ATOMIC_READ: type_str = "atomic read"; break; @@ -371,6 +443,15 @@ void ModelAction::print() const case ATOMIC_TRYLOCK: type_str = "trylock"; break; + case ATOMIC_WAIT: + type_str = "wait"; + break; + case ATOMIC_NOTIFY_ONE: + type_str = "notify one"; + break; + case ATOMIC_NOTIFY_ALL: + type_str = "notify all"; + break; default: type_str = "unknown type"; } @@ -398,17 +479,35 @@ void ModelAction::print() const break; } - printf("(%3d) Thread: %-2d Action: %-13s MO: %7s Loc: %14p Value: %-12" PRIu64, + model_print("(%4d) Thread: %-2d Action: %-13s MO: %7s Loc: %14p Value: %-#18" PRIx64, seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint); if (is_read()) { if (reads_from) - printf(" Rf: %d", reads_from->get_seq_number()); + model_print(" Rf: %-3d", reads_from->get_seq_number()); else - printf(" Rf: ?"); + model_print(" Rf: ? "); } if (cv) { - printf("\t"); + if (is_read()) + model_print(" "); + else + model_print(" "); cv->print(); } else - printf("\n"); + model_print("\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 ^= id_to_int(tid) << 6; + + if (is_read()) { + if (reads_from) + hash^=reads_from->get_seq_number(); + } + return hash; }