add support for pthread_create (in progress)

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 3d10f4533bd10e320b17523cdf7affbcb07a476c..d7034e93e0d5d34afcfe0377dda9b4688dce91f5 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -51,10 +51,7 @@ 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 )
-               curr_thread->start_routine(curr_thread->arg);
-       else
-               curr_thread->pstart_routine(curr_thread->arg);
+       curr_thread->start_routine(curr_thread->arg);
        /* Finish thread properly */
        model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 }
@@ -172,17 +169,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 +197,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()
 {