swapcontext() fix for Mac OSX

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index f417b3ff353fa3a59a23328c44dfb6b908f4727c..ae2905a9819a7d4e0159fbbf6d4f439850da1f40 100644 (file)
--- 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)
 {
@@ -160,7 +159,6 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
        arg(a),
        user_thread(t),
        state(THREAD_CREATED),
-       wait_list(),
        last_action_val(VALUE_NONE),
        model_thread(false)
 {
@@ -180,7 +178,6 @@ Thread::~Thread()
 {
        if (!is_complete())
                complete();
-       model->remove_thread(this);
 }
 
 /** @return The thread_id_t corresponding to this Thread object. */
@@ -200,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
@@ -214,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;
+}