#include <stdio.h>
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
#include "model.h"
#include "action.h"
bool ModelAction::is_read() const
{
- return type == ATOMIC_READ;
+ return type == ATOMIC_READ || type == ATOMIC_RMW;
}
bool ModelAction::is_write() const
{
- return type == ATOMIC_WRITE || type == ATOMIC_INIT;
+ return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
}
bool ModelAction::is_rmw() const
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
+ this->type=act->type;
+ this->order=act->order;
+ 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.
if (act->is_release() && this->is_acquire())
cv->merge(act->cv);
reads_from = act;
- value = act->value;
}
/**
type_str = "unknown type";
}
- printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %-8u",
- seq_number, id_to_int(tid), type_str, order, location, value);
+ uint64_t valuetoprint=type==ATOMIC_READ?reads_from->value: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) {