X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=33dbe75b22c7c3daf8f25f0b51f4a077d652e682;hp=9f95727c8dcb63b27dfffc9782ab376a644d852b;hb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;hpb=f3ef22bef8d339c7d45b7d7232cdcf183a0b7776 diff --git a/action.cc b/action.cc index 9f95727c..33dbe75b 100644 --- a/action.cc +++ b/action.cc @@ -1,23 +1,23 @@ #include +#define __STDC_FORMAT_MACROS +#include #include "model.h" #include "action.h" #include "clockvector.h" #include "common.h" -ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value) +ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value) : + type(type), + order(order), + location(loc), + value(value), + reads_from(NULL), + cv(NULL) { Thread *t = thread_current(); - ModelAction *act = this; - - act->type = type; - act->order = order; - act->location = loc; - act->tid = t->get_id(); - act->value = value; - act->seq_number = model->get_next_seq_num(); - - cv = NULL; + this->tid = t->get_id(); + this->seq_number = model->get_next_seq_num(); } ModelAction::~ModelAction() @@ -28,12 +28,17 @@ ModelAction::~ModelAction() bool ModelAction::is_read() const { - return type == ATOMIC_READ; + return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW; } bool ModelAction::is_write() const { - return type == ATOMIC_WRITE; + return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT; +} + +bool ModelAction::is_rmwr() const +{ + return type == ATOMIC_RMWR; } bool ModelAction::is_rmw() const @@ -41,12 +46,22 @@ bool ModelAction::is_rmw() const return type == ATOMIC_RMW; } +bool ModelAction::is_rmwc() const +{ + return type == ATOMIC_RMWC; +} + +bool ModelAction::is_initialization() const +{ + return type == ATOMIC_INIT; +} + bool ModelAction::is_acquire() const { switch (order) { - case memory_order_acquire: - case memory_order_acq_rel: - case memory_order_seq_cst: + case std::memory_order_acquire: + case std::memory_order_acq_rel: + case std::memory_order_seq_cst: return true; default: return false; @@ -56,9 +71,9 @@ bool ModelAction::is_acquire() const bool ModelAction::is_release() const { switch (order) { - case memory_order_release: - case memory_order_acq_rel: - case memory_order_seq_cst: + case std::memory_order_release: + case std::memory_order_acq_rel: + case std::memory_order_seq_cst: return true; default: return false; @@ -67,7 +82,7 @@ bool ModelAction::is_release() const bool ModelAction::is_seqcst() const { - return order==memory_order_seq_cst; + return order==std::memory_order_seq_cst; } bool ModelAction::same_var(const ModelAction *act) const @@ -80,6 +95,27 @@ bool ModelAction::same_thread(const ModelAction *act) const return tid == act->tid; } +void ModelAction::copy_typeandorder(ModelAction * act) { + this->type=act->type; + this->order=act->order; +} + +/** This method changes an existing read part of an RMW action into either: + * (1) a full RMW action in case of the completed write or + * (2) a READ action in case a failed action. + * @todo If the memory_order changes, we may potentially need to update our + * clock vector. + */ +void ModelAction::process_rmw(ModelAction * act) { + this->order=act->order; + if (act->is_rmwc()) + this->type=ATOMIC_READ; + else if (act->is_rmw()) { + this->type=ATOMIC_RMW; + this->value=act->value; + } +} + /** The is_synchronizing method should only explore interleavings if: * (1) the operations are seq_cst and don't commute or * (2) the reordering may establish or break a synchronization relation. @@ -89,7 +125,6 @@ bool ModelAction::same_thread(const ModelAction *act) const * @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 { //Same thread can't be reordered @@ -99,7 +134,7 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const // Different locations commute 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() && is_seqcst() && act->is_write() && act->is_seqcst()) @@ -115,7 +150,7 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const return false; } -void ModelAction::create_cv(ModelAction *parent) +void ModelAction::create_cv(const ModelAction *parent) { ASSERT(cv == NULL); @@ -125,12 +160,25 @@ void ModelAction::create_cv(ModelAction *parent) cv = new ClockVector(NULL, this); } -void ModelAction::read_from(ModelAction *act) + +/** Update the model action's read_from action */ +void ModelAction::read_from(const ModelAction *act) { ASSERT(cv); - if (act->is_release() && this->is_acquire()) + if (act->is_release() && this->is_acquire()) { + synchronized(act); cv->merge(act->cv); - value = act->value; + } + reads_from = act; +} + + +/** Synchronize the current thread with the thread corresponding to + * the ModelAction parameter. */ + +void ModelAction::synchronized(const ModelAction *act) { + model->check_promises(cv, act->cv); + cv->merge(act->cv); } /** @@ -139,18 +187,21 @@ void ModelAction::read_from(ModelAction *act) * @return true if this action's thread has synchronized with act's thread * since the execution of act, false otherwise. */ -bool ModelAction::happens_before(ModelAction *act) +bool ModelAction::happens_before(const ModelAction *act) const { return act->cv->synchronized_since(this); } -void ModelAction::print(void) +void ModelAction::print(void) const { const char *type_str; switch (this->type) { case THREAD_CREATE: type_str = "thread create"; break; + case THREAD_START: + type_str = "thread start"; + break; case THREAD_YIELD: type_str = "thread yield"; break; @@ -166,12 +217,25 @@ void ModelAction::print(void) case ATOMIC_RMW: type_str = "atomic rmw"; break; + case ATOMIC_RMWR: + type_str = "atomic rmwr"; + break; + case ATOMIC_RMWC: + type_str = "atomic rmwc"; + break; + case ATOMIC_INIT: + type_str = "init atomic"; + break; default: type_str = "unknown type"; } - printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %d", - seq_number, id_to_int(tid), type_str, order, location, value); + uint64_t valuetoprint=type==ATOMIC_READ?(reads_from!=NULL?reads_from->value:VALUE_NONE):value; + + printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %-12" PRIu64, + seq_number, id_to_int(tid), type_str, order, location, valuetoprint); + if (reads_from) + printf(" Rf: %d", reads_from->get_seq_number()); if (cv) { printf("\t"); cv->print();