Get gdax to not crash

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 3d10f4533bd10e320b17523cdf7affbcb07a476c..67f681ca7052538afb794ff87bb9708ff3655daa 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include <threads.h>
-#include <mutex>
+#include "mutex.h"
 #include "common.h"
 #include "threads-model.h"
 #include "action.h"
@@ -51,10 +51,13 @@ void thread_startup()
        model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
 
        /* Call the actual thread function */
-       if ( !curr_thread->start_routine )
+       if (curr_thread->start_routine != NULL) {
                curr_thread->start_routine(curr_thread->arg);
-       else
-               curr_thread->pstart_routine(curr_thread->arg);
+       } else if (curr_thread->pstart_routine != NULL) {
+               // set pthread return value
+               void *retval = curr_thread->pstart_routine(curr_thread->arg);
+               curr_thread->set_pthread_return(retval);
+       }
        /* Finish thread properly */
        model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 }
@@ -140,7 +143,7 @@ Thread::Thread(thread_id_t tid) :
        stack(NULL),
        user_thread(NULL),
        id(tid),
-       state(THREAD_READY), /* Thread is always ready? */
+       state(THREAD_READY),    /* Thread is always ready? */
        last_action_val(0),
        model_thread(true)
 {
@@ -158,6 +161,7 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread
        creation(NULL),
        pending(NULL),
        start_routine(func),
+       pstart_routine(NULL),
        arg(a),
        user_thread(t),
        id(tid),
@@ -172,17 +176,16 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread
        if (ret)
                model_print("Error in create_context\n");
 
-       user_thread->priv = this;
+       user_thread->priv = this;       // WL
 }
 
-/** 
- * to be modified
- * Construct a new thread for pthread_create.
+/**
+ * Construct a new thread for pthread.
  * @param t The thread identifier of the newly created thread.
  * @param func The function that the thread will call.
  * @param a The parameter to pass to this function.
  */
-Thread::Thread(thread_id_t tid, 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),
@@ -201,10 +204,9 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void* (*func)(void *), void *a, Threa
        ret = create_context();
        if (ret)
                model_print("Error in create_context\n");
-
-       user_thread->priv = this;
 }
 
+
 /** Destructor */
 Thread::~Thread()
 {
@@ -239,9 +241,8 @@ Thread * Thread::waiting_on() const
 
        if (pending->get_type() == THREAD_JOIN)
                return pending->get_thread_operand();
-       else if (pending->get_type() == PTHREAD_JOIN) {
-               // WL: to be added
-       }
+       else if (pending->get_type() == PTHREAD_JOIN)
+               return pending->get_thread_operand();
        else if (pending->is_lock())
                return (Thread *)pending->get_mutex()->get_state()->locked;
        return NULL;
@@ -257,7 +258,7 @@ Thread * Thread::waiting_on() const
 bool Thread::is_waiting_on(const Thread *t) const
 {
        Thread *wait;
-       for (wait = waiting_on(); wait != NULL; wait = wait->waiting_on())
+       for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
                if (wait == t)
                        return true;
        return false;