threads: add waiting_on()

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 1de548ccdb93ccd41a2a0248a49be2937dd87f01..f417b3ff353fa3a59a23328c44dfb6b908f4727c 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include <threads.h>
+#include <mutex>
 #include "common.h"
 #include "threads-model.h"
 #include "action.h"
@@ -151,7 +152,8 @@ 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::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
+       parent(parent),
        creation(NULL),
        pending(NULL),
        start_routine(func),
@@ -171,7 +173,6 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
 
        id = model->get_next_id();
        user_thread->priv = this;
-       parent = thread_current();
 }
 
 /** Destructor */
@@ -197,3 +198,19 @@ void Thread::set_state(thread_state s)
        ASSERT(s == THREAD_COMPLETED || state != THREAD_COMPLETED);
        state = s;
 }
+
+/**
+ * Get the Thread that this Thread is 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;
+}