location(loc),
value(value),
reads_from(NULL),
+ reads_from_promise(NULL),
last_fence_release(NULL),
node(NULL),
seq_number(ACTION_INITIAL_CLOCK),
*/
Thread * ModelAction::get_thread_operand() const
{
- if (type == THREAD_CREATE)
- /* THREAD_CREATE uses (Thread *) for location */
- return (Thread *)get_location();
- else if (type == THREAD_JOIN)
+ if (type == THREAD_CREATE) {
+ /* THREAD_CREATE stores its (Thread *) in a thrd_t::priv */
+ thrd_t *thrd = (thrd_t *)get_location();
+ return thrd->priv;
+ } else if (type == THREAD_JOIN)
/* THREAD_JOIN uses (Thread *) for location */
return (Thread *)get_location();
else
if (!same_var(act))
return false;
- // Explore interleavings of seqcst writes/fences to guarantee total
+ // Explore interleavings of seqcst writes 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())
+ if ((could_be_write() || act->could_be_write()) && 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()))
+ // Explore synchronizing read/write pairs
+ if (is_acquire() && act->is_release() && is_read() && act->could_be_write())
return true;
// lock just released...we can grab lock
void ModelAction::set_read_from(const ModelAction *act)
{
reads_from = act;
+ reads_from_promise = NULL;
if (act && act->is_uninitialized())
model->assert_bug("May read from uninitialized atomic\n");
}
+/**
+ * Set this action's read-from promise
+ * @param promise The promise to read from
+ */
+void ModelAction::set_read_from_promise(const Promise *promise)
+{
+ ASSERT(is_read());
+ reads_from_promise = promise;
+ reads_from = NULL;
+}
+
/**
* Synchronize the current thread with the thread corresponding to the
* ModelAction parameter.
}
uint64_t valuetoprint;
- if (type == ATOMIC_READ && reads_from != NULL)
+ if (is_read() && reads_from)
valuetoprint = reads_from->value;
+ else if (is_read() && reads_from_promise)
+ valuetoprint = reads_from_promise->get_value();
else
valuetoprint = value;
model_print("\n");
}
-/** @brief Print nicely-formatted info about this ModelAction */
+/** @brief Get a (likely) unique hash for this ModelAction */
unsigned int ModelAction::hash() const
{
unsigned int hash = (unsigned int)this->type;