*/
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 to guarantee total
+ // Explore interleavings of seqcst writes/fences to guarantee total
// order of seq_cst operations that don't commute
- if ((could_be_write() || act->could_be_write()) && is_seqcst() && act->is_seqcst())
+ if ((could_be_write() || act->could_be_write() || is_fence() || act->is_fence()) && is_seqcst() && act->is_seqcst())
return true;
// Explore synchronizing read/write pairs
*/
void ModelAction::set_read_from(const ModelAction *act)
{
+ ASSERT(act);
reads_from = act;
reads_from_promise = NULL;
- if (act && act->is_uninitialized())
+ if (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)
+void ModelAction::set_read_from_promise(Promise *promise)
{
ASSERT(is_read());
reads_from_promise = promise;
if (is_read()) {
if (reads_from)
model_print(" Rf: %-3d", reads_from->get_seq_number());
- else
+ else if (reads_from_promise) {
+ int idx = model->get_promise_number(reads_from_promise);
+ if (idx >= 0)
+ model_print(" Rf: P%-2d", idx);
+ else
+ model_print(" RF: P? ");
+ } else
model_print(" Rf: ? ");
}
if (cv) {