bool ModelAction::is_read() const
{
- return type == ATOMIC_READ || type == ATOMIC_RMW;
+ return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW;
}
bool ModelAction::is_write() const
return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
}
+bool ModelAction::is_rmwr() const
+{
+ return type == ATOMIC_RMWR;
+}
+
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;
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;
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
return tid == act->tid;
}
-void ModelAction::upgrade_rmw(ModelAction * act) {
- ASSERT(is_read());
- ASSERT(act->is_rmw());
- //Upgrade our type to the act's type
+void ModelAction::copy_typeandorder(ModelAction * act) {
this->type=act->type;
this->order=act->order;
- this->value=act->value;
+}
+
+/** 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:
* @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
void ModelAction::create_cv(const ModelAction *parent)
{
- ASSERT(cv == NULL);
+ if (cv)
+ delete cv;
if (parent)
cv = new ClockVector(parent->cv, this);
cv = new ClockVector(NULL, this);
}
+/** Update the model action's read_from action */
void ModelAction::read_from(const ModelAction *act)
{
ASSERT(cv);
- if (act->is_release() && this->is_acquire())
- cv->merge(act->cv);
+ if (act!=NULL && act->is_release() && this->is_acquire()) {
+ synchronize_with(act);
+ }
reads_from = act;
}
+/**
+ * Synchronize the current thread with the thread corresponding to the
+ * ModelAction parameter.
+ * @param act The ModelAction to synchronize with
+ */
+void ModelAction::synchronize_with(const ModelAction *act) {
+ model->check_promises(cv, act->cv);
+ cv->merge(act->cv);
+}
+
/**
* Check whether 'this' happens before act, according to the memory-model's
* happens before relation. This is checked via the ClockVector constructs.
void ModelAction::print(void) const
{
- const char *type_str;
+ const char *type_str, *mo_str;
switch (this->type) {
case THREAD_CREATE:
type_str = "thread create";
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;
type_str = "unknown type";
}
- uint64_t valuetoprint=type==ATOMIC_READ?reads_from->value:value;
+ uint64_t valuetoprint=type==ATOMIC_READ?(reads_from!=NULL?reads_from->value:VALUE_NONE):value;
+
+ switch (this->order) {
+ case std::memory_order_relaxed:
+ mo_str = "relaxed";
+ break;
+ case std::memory_order_acquire:
+ mo_str = "acquire";
+ break;
+ case std::memory_order_release:
+ mo_str = "release";
+ break;
+ case std::memory_order_acq_rel:
+ mo_str = "acq_rel";
+ break;
+ case std::memory_order_seq_cst:
+ mo_str = "seq_cst";
+ break;
+ default:
+ mo_str = "unknown";
+ break;
+ }
- printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %-12" PRIu64,
- seq_number, id_to_int(tid), type_str, order, location, valuetoprint);
+ 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 (cv) {