X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=threads.cc;h=a0bc02970aa9ff71c6e8e1a04f6565d52b6db43a;hp=00e5c2fbd4a0f1287ac6b68b8be50a1a49b82bd8;hb=20956d81209b12a99ced78f51dd4294a0638343f;hpb=a575b5d5d2f0edab95e7e0ef8ca6e40b68e0bad9

diff --git a/threads.cc b/threads.cc
index 00e5c2f..a0bc029 100644
--- a/threads.cc
+++ b/threads.cc
@@ -93,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);
 }
 
 /**
@@ -107,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);
 }
 
 
@@ -139,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)
 {
@@ -152,15 +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) :
+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)
 {
@@ -171,7 +170,6 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
 	if (ret)
 		model_print("Error in create_context\n");
 
-	id = model->get_next_id();
 	user_thread->priv = this;
 }
 
@@ -199,7 +197,7 @@ void Thread::set_state(thread_state s)
 }
 
 /**
- * Get the Thread that this Thread is waiting on
+ * 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
@@ -213,3 +211,19 @@ Thread * Thread::waiting_on() const
 		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;
+}