X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=67f681ca7052538afb794ff87bb9708ff3655daa;hb=1f7db9400a03f8f889e6020414f2fe17d62fdc62;hp=d7034e93e0d5d34afcfe0377dda9b4688dce91f5;hpb=53504d64f6149c5309577ecaed42450a02e27293;p=c11tester.git

diff --git a/threads.cc b/threads.cc
index d7034e93..67f681ca 100644
--- 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,7 +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 */
-	curr_thread->start_routine(curr_thread->arg);
+	if (curr_thread->start_routine != NULL) {
+		curr_thread->start_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));
 }
@@ -137,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)
 {
@@ -155,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),
@@ -169,7 +176,7 @@ 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; // WL
+	user_thread->priv = this;	// WL
 }
 
 /**
@@ -234,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;
@@ -252,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;