bool ModelAction::is_thread_join() const
{
- return type == THREAD_JOIN;
+ return type == THREAD_JOIN || type == PTHREAD_JOIN;
}
bool ModelAction::is_relseq_fixup() const
Thread * ModelAction::get_thread_operand() const
{
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_operand is set in execution.cc */
+ return thread_operand;
+ } else if (type == PTHREAD_CREATE) {
+ return thread_operand;
+ } else if (type == THREAD_JOIN) {
/* THREAD_JOIN uses (Thread *) for location */
return (Thread *)get_location();
- else
+ } else if (type == PTHREAD_JOIN) {
+ // return NULL;
+ // thread_operand is stored in execution::pthread_map;
+ return (Thread *)get_location();
+ } else
return NULL;
}
case THREAD_YIELD: return "thread yield";
case THREAD_JOIN: return "thread join";
case THREAD_FINISH: return "thread finish";
+
+ case PTHREAD_CREATE: return "pthread create";
+ case PTHREAD_JOIN: return "pthread join";
+
case ATOMIC_UNINIT: return "uninitialized";
case ATOMIC_READ: return "atomic read";
case ATOMIC_WRITE: return "atomic write";
{
const char *type_str = get_type_str(), *mo_str = get_mo_str();
- model_print("%-4d %-2d %-13s %7s %14p %-#18" PRIx64,
+ model_print("%-4d %-2d %-14s %7s %14p %-#18" PRIx64,
seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value());
if (is_read()) {
if (reads_from)
* Only valid for LOCK, TRY_LOCK, UNLOCK, and WAIT operations.
* @return The mutex operated on by this action, if any; otherwise NULL
*/
-std::mutex * ModelAction::get_mutex() const
+cdsc::mutex * ModelAction::get_mutex() const
{
if (is_trylock() || is_lock() || is_unlock())
- return (std::mutex *)get_location();
+ return (cdsc::mutex *)get_location();
else if (is_wait())
- return (std::mutex *)get_value();
+ return (cdsc::mutex *)get_value();
else
return NULL;
}