X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads.cc;h=aef263ec4624418c2fc050cd3a998e8ad80bd878;hp=61df56d773c4eaf91d273bcde0750541bcd9f0b7;hb=055fb927ea688ec513508b0821e331558eea40d1;hpb=6a8418d0db4156af9e99c48a9a0e0a4aaa52c42e

diff --git a/threads.cc b/threads.cc
index 61df56d7..aef263ec 100644
--- a/threads.cc
+++ b/threads.cc
@@ -14,6 +14,7 @@
 #include "model.h"
 #include "execution.h"
 #include "schedule.h"
+#include "clockvector.h"
 
 #ifdef TLS
 #include <dlfcn.h>
@@ -59,21 +60,14 @@ Thread * thread_current(void)
 	return model->get_current_thread();
 }
 
-#ifdef TLS
 void modelexit() {
-	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+	model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
 }
-#endif
 
-void main_thread_startup() {
-#ifdef TLS
+void initMainThread() {
 	atexit(modelexit);
 	Thread * curr_thread = thread_current();
-
-	/* Add dummy "start" action, just to create a first clock vector */
-	model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
-#endif
-	thread_startup();
+	model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
 }
 
 /**
@@ -86,7 +80,7 @@ void thread_startup()
 	Thread * curr_thread = thread_current();
 #ifndef TLS
 	/* Add dummy "start" action, just to create a first clock vector */
-	model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
+	model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
 #endif
 
 	/* Call the actual thread function */
@@ -99,7 +93,7 @@ void thread_startup()
 	}
 #ifndef TLS
 	/* Finish thread properly */
-	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
+	model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 #endif
 }
 
@@ -178,7 +172,7 @@ void real_init_all() {
 	}
 
 	if (!pthread_exit_p) {
-		pthread_exit_p = (void (*)(void *))dlsym(RTLD_NEXT, "pthread_exit");
+		*((void (**)(void *)) &pthread_exit_p) = (void (*)(void *))dlsym(RTLD_NEXT, "pthread_exit");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -218,7 +212,7 @@ void * helper_thread(void * ptr) {
 	curr_thread->helpercontext.uc_stack.ss_sp = curr_thread->helper_stack;
 	curr_thread->helpercontext.uc_stack.ss_size = STACK_SIZE;
 	curr_thread->helpercontext.uc_stack.ss_flags = 0;
-	curr_thread->helpercontext.uc_link = model->get_system_context();
+	curr_thread->helpercontext.uc_link = NULL;
 	makecontext(&curr_thread->helpercontext, finalize_helper_thread, 0);
 
 	model_swapcontext(&curr_thread->context, &curr_thread->helpercontext);
@@ -241,7 +235,7 @@ void tlsdestructor(void *v) {
 		return;
 	}
 	/* Finish thread properly */
-	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+	model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
 }
 #endif
 
@@ -249,7 +243,7 @@ void setup_context() {
 	Thread * curr_thread = thread_current();
 
 	/* Add dummy "start" action, just to create a first clock vector */
-	model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
+	model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
 
 	real_init_all();
 
@@ -291,12 +285,9 @@ int Thread::create_context()
 	context.uc_stack.ss_sp = stack;
 	context.uc_stack.ss_size = STACK_SIZE;
 	context.uc_stack.ss_flags = 0;
-	context.uc_link = model->get_system_context();
+	context.uc_link = NULL;
 #ifdef TLS
-	if (model != NULL)
-		makecontext(&context, setup_context, 0);
-	else
-		makecontext(&context, main_thread_startup, 0);
+	makecontext(&context, setup_context, 0);
 #else
 	makecontext(&context, thread_startup, 0);
 #endif
@@ -340,23 +331,38 @@ int Thread::swap(ucontext_t *ctxt, Thread *t)
 	return model_swapcontext(ctxt, &t->context);
 }
 
+int Thread::swap(Thread *t, Thread *t2)
+{
+	t2->set_state(THREAD_RUNNING);
+	if (t == t2)
+		return 0;
+
+#ifdef TLS
+	if (t2->tls != NULL)
+		set_tls_addr((uintptr_t)t2->tls);
+#endif
+	return model_swapcontext(&t->context, &t2->context);
+}
 
-/** Terminate a thread and free its stack. */
+/** Terminate a thread. */
 void Thread::complete()
 {
 	ASSERT(!is_complete());
 	DEBUG("completed thread %d\n", id_to_int(get_id()));
 	state = THREAD_COMPLETED;
+}
+
+void Thread::freeResources() {
 	if (stack)
 		stack_free(stack);
 #ifdef TLS
-	if (this != model->getInitThread() && !model->getParams()->threadsnocleanup) {
-		ASSERT(thread_current()==NULL);
+	if (this != model->getInitThread()) {
 		real_pthread_mutex_unlock(&mutex2);
 		real_pthread_join(thread, NULL);
 		stack_free(helper_stack);
 	}
 #endif
+	state = THREAD_FREED;
 }
 
 /**
@@ -369,8 +375,10 @@ void Thread::complete()
  */
 Thread::Thread(thread_id_t tid) :
 	parent(NULL),
+	acq_fence_cv(new ClockVector()),
 	creation(NULL),
 	pending(NULL),
+	wakeup_state(false),
 	start_routine(NULL),
 	arg(NULL),
 	stack(NULL),
@@ -394,8 +402,10 @@ Thread::Thread(thread_id_t tid) :
  */
 Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
 	parent(parent),
+	acq_fence_cv(new ClockVector()),
 	creation(NULL),
 	pending(NULL),
+	wakeup_state(false),
 	start_routine(func),
 	pstart_routine(NULL),
 	arg(a),
@@ -426,8 +436,10 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread
  */
 Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent) :
 	parent(parent),
+	acq_fence_cv(new ClockVector()),
 	creation(NULL),
 	pending(NULL),
+	wakeup_state(false),
 	start_routine(NULL),
 	pstart_routine(func),
 	arg(a),
@@ -454,6 +466,8 @@ Thread::~Thread()
 {
 	if (!is_complete())
 		complete();
+
+	delete acq_fence_cv;
 }
 
 /** @return The thread_id_t corresponding to this Thread object. */
@@ -500,6 +514,14 @@ Thread * Thread::waiting_on() const
 bool Thread::is_waiting_on(const Thread *t) const
 {
 	Thread *wait;
+
+	// One thread relocks a recursive mutex
+	if (waiting_on() == t && pending->is_lock()) {
+		int mutex_type = pending->get_mutex()->get_state()->type;
+		if (mutex_type == PTHREAD_MUTEX_RECURSIVE)
+			return false;
+	}
+
 	for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
 		if (wait == t)
 			return true;