#include "action.h"
#include "clockvector.h"
#include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "nodestack.h"
#define ACTION_INITIAL_CLOCK 0
-ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value) :
+/**
+ * @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),
+ node(NULL),
seq_number(ACTION_INITIAL_CLOCK),
- cv(NULL)
+ cv(NULL),
+ sleep_flag(false)
{
- Thread *t = thread_current();
+ /* References to NULL atomic variables can end up here */
+ ASSERT(loc || type == MODEL_FIXUP_RELSEQ);
+
+ Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
}
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;
+ 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
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;
return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
}
+bool ModelAction::could_be_write() const
+{
+ return is_write() || is_rmwr();
+}
+
bool ModelAction::is_rmwr() const
{
return type == ATOMIC_RMWR;
* @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))
// 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 ((could_be_write() || act->could_be_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())
+ if (is_read() && is_acquire() && act->could_be_write() && act->is_release())
return true;
// Otherwise handle by reads_from relation
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;
}
value=VALUE_TRYFAILED;
}
-/** Update the model action's read_from action */
-void ModelAction::read_from(const ModelAction *act)
+/**
+ * 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);
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]))
+ if (!synchronize_with(release_heads[i])) {
model->set_bad_synchronization();
+ num_heads--;
+ }
+ return num_heads > 0;
}
+ return false;
}
/**
bool ModelAction::synchronize_with(const ModelAction *act) {
if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
return false;
- model->check_promises(cv, act->cv);
+ model->check_promises(act->get_tid(), cv, act->cv);
cv->merge(act->cv);
return true;
}
{
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;
break;
}
- printf("(%3d) Thread: %-2d Action: %-13s MO: %7s Loc: %14p Value: %-12" PRIu64,
+ printf("(%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());
+ printf(" Rf: %-3d", reads_from->get_seq_number());
else
- printf(" Rf: ?");
+ printf(" Rf: ? ");
}
if (cv) {
- printf("\t");
+ if (is_read())
+ printf(" ");
+ else
+ printf(" ");
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;
+}
projects / c11tester.git / blobdiff