X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=a0bc02970aa9ff71c6e8e1a04f6565d52b6db43a;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=cbedbb18bae1d73db1c46a531b4141886875b6be;hpb=0997f5bf1b28a79066ed4abfed57f14419ee44d3;p=model-checker.git diff --git a/threads.cc b/threads.cc index cbedbb1..a0bc029 100644 --- a/threads.cc +++ b/threads.cc @@ -5,6 +5,7 @@ #include #include +#include #include "common.h" #include "threads-model.h" #include "action.h" @@ -92,7 +93,7 @@ int Thread::create_context() int Thread::swap(Thread *t, ucontext_t *ctxt) { t->set_state(THREAD_READY); - return swapcontext(&t->context, ctxt); + return model_swapcontext(&t->context, ctxt); } /** @@ -106,7 +107,7 @@ int Thread::swap(Thread *t, ucontext_t *ctxt) int Thread::swap(ucontext_t *ctxt, Thread *t) { t->set_state(THREAD_RUNNING); - return swapcontext(ctxt, &t->context); + return model_swapcontext(ctxt, &t->context); } @@ -138,7 +139,6 @@ Thread::Thread(thread_id_t tid) : user_thread(NULL), id(tid), state(THREAD_READY), /* Thread is always ready? */ - wait_list(), last_action_val(0), model_thread(true) { @@ -151,14 +151,15 @@ Thread::Thread(thread_id_t tid) : * @param func The function that the thread will call. * @param a The parameter to pass to this function. */ -Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread * parent_thrd) : +Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) : + parent(parent), creation(NULL), pending(NULL), start_routine(func), arg(a), user_thread(t), + id(tid), state(THREAD_CREATED), - wait_list(), last_action_val(VALUE_NONE), model_thread(false) { @@ -169,9 +170,7 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread * parent_thrd) : if (ret) model_print("Error in create_context\n"); - id = model->get_next_id(); user_thread->priv = this; - parent = parent_thrd ? parent_thrd : thread_current(); } /** Destructor */ @@ -179,7 +178,6 @@ Thread::~Thread() { if (!is_complete()) complete(); - model->remove_thread(this); } /** @return The thread_id_t corresponding to this Thread object. */ @@ -197,3 +195,35 @@ void Thread::set_state(thread_state s) ASSERT(s == THREAD_COMPLETED || state != THREAD_COMPLETED); state = s; } + +/** + * Get the Thread that this Thread is immediately waiting on + * @return The thread we are waiting on, if any; otherwise NULL + */ +Thread * Thread::waiting_on() const +{ + if (!pending) + return NULL; + + if (pending->get_type() == THREAD_JOIN) + return pending->get_thread_operand(); + else if (pending->is_lock()) + return (Thread *)pending->get_mutex()->get_state()->locked; + return NULL; +} + +/** + * Check if this Thread is waiting (blocking) on a given Thread, directly or + * indirectly (via a chain of waiting threads) + * + * @param t The Thread on which we may be waiting + * @return True if we are waiting on Thread t; false otherwise + */ +bool Thread::is_waiting_on(const Thread *t) const +{ + Thread *wait; + for (wait = waiting_on(); wait != NULL; wait = wait->waiting_on()) + if (wait == t) + return true; + return false; +}