cv(NULL),
sleep_flag(false)
{
+ /* 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();
}
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;
bool ModelAction::same_var(const ModelAction *act) const
{
+ if ( act->is_wait() || is_wait() ) {
+ if ( act->is_wait() && is_wait() ) {
+ if ( ((void *)value) == ((void *)act->value) )
+ return true;
+ } else if ( is_wait() ) {
+ if ( ((void *)value) == act->location )
+ return true;
+ } else if ( act->is_wait() ) {
+ if ( location == ((void *)act->value) )
+ return true;
+ }
+ }
+
return location == act->location;
}
if (is_read() && is_acquire() && act->could_be_write() && act->is_release())
return true;
+ //lock just released...we can grab lock
+ if ((is_lock() ||is_trylock()) && (act->is_unlock()||act->is_wait()))
+ return true;
+
+ //lock just acquired...we can fail to grab lock
+ if (is_trylock() && act->is_success_lock())
+ return true;
+
+ //other thread stalling on lock...we can release lock
+ if (is_unlock() && (act->is_trylock()||act->is_lock()))
+ return true;
+
+ if (is_trylock() && (act->is_unlock()||act->is_wait()))
+ return true;
+
+ if ( is_notify() && act->is_wait() )
+ return true;
+
+ if ( is_wait() && act->is_notify() )
+ return true;
+
// Otherwise handle by reads_from relation
return false;
}
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;
}
bool ModelAction::has_synchronized_with(const ModelAction *act) const
{
- return cv->has_synchronized_with(act->cv);
+ return cv->synchronized_since(act);
}
/**
case ATOMIC_TRYLOCK:
type_str = "trylock";
break;
+ case ATOMIC_WAIT:
+ type_str = "wait";
+ break;
+ case ATOMIC_NOTIFY_ONE:
+ type_str = "notify one";
+ break;
+ case ATOMIC_NOTIFY_ALL:
+ type_str = "notify all";
+ break;
default:
type_str = "unknown type";
}
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");
unsigned int hash=(unsigned int) this->type;
hash^=((unsigned int)this->order)<<3;
hash^=seq_number<<5;
- hash^=tid<<6;
+ hash ^= id_to_int(tid) << 6;
if (is_read()) {
if (reads_from)