this->order = act->order;
}
+/**
+ * Get the Thread which is the operand of this action. This is only valid for
+ * THREAD_* operations (currently only for THREAD_CREATE and THREAD_JOIN). Note
+ * that this provides a central place for determining the conventions of Thread
+ * storage in ModelAction, where we generally aren't very type-safe (e.g., we
+ * store object references in a (void *) address.
+ *
+ * For THREAD_CREATE, this yields the Thread which is created.
+ * For THREAD_JOIN, this yields the Thread we are joining with.
+ *
+ * @return The Thread which this action acts on, if exists; otherwise NULL
+ */
+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)
+ /* THREAD_JOIN uses (Thread *) for location */
+ return (Thread *)get_location();
+ else
+ return NULL;
+}
+
/** 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.
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;