Bug fix

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 8b3e0c6191ae7c9333c11fcafff83570819c4863..8b55a91b186b61534ec124ca2a990283c11a3ffb 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -13,6 +13,7 @@
 /* global "model" object */
 #include "model.h"
 #include "execution.h"
+#include "schedule.h"
 
 #ifdef TLS
 #include <dlfcn.h>
@@ -58,13 +59,14 @@ Thread * thread_current(void)
        return model->get_current_thread();
 }
 
-void main_thread_startup() {
-#ifdef TLS
+void modelexit() {
+       model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+}
+
+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();
 }
 
 /**
@@ -88,11 +90,12 @@ void thread_startup()
                void *retval = curr_thread->pstart_routine(curr_thread->arg);
                curr_thread->set_pthread_return(retval);
        }
+#ifndef TLS
        /* Finish thread properly */
        model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
+#endif
 }
 
-#ifdef TLS
 static int (*pthread_mutex_init_p)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) = NULL;
 
 int real_pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) {
@@ -123,6 +126,12 @@ int real_pthread_join (pthread_t __th, void ** __thread_return) {
        return pthread_join_p(__th, __thread_return);
 }
 
+static void (*pthread_exit_p)(void *) __attribute__((noreturn))= NULL;
+
+void real_pthread_exit (void * value_ptr) {
+       pthread_exit_p(value_ptr);
+}
+
 void real_init_all() {
        char * error;
        if (!pthread_mutex_init_p) {
@@ -160,8 +169,17 @@ void real_init_all() {
                        exit(EXIT_FAILURE);
                }
        }
+
+       if (!pthread_exit_p) {
+               *((void (**)(void *)) &pthread_exit_p) = (void (*)(void *))dlsym(RTLD_NEXT, "pthread_exit");
+               if ((error = dlerror()) != NULL) {
+                       fputs(error, stderr);
+                       exit(EXIT_FAILURE);
+               }
+       }
 }
 
+#ifdef TLS
 void finalize_helper_thread() {
        Thread * curr_thread = thread_current();
        real_pthread_mutex_lock(&curr_thread->mutex);
@@ -181,9 +199,16 @@ void * helper_thread(void * ptr) {
        int ret = getcontext(&curr_thread->helpercontext);
        ASSERT(!ret);
 
+       //Setup destructor
+       if (pthread_setspecific(model->get_execution()->getPthreadKey(), (const void *)4)) {
+               printf("Destructor setup failed\n");
+               exit(-1);
+       }
+
+
        /* Initialize new managed context */
-       void *helperstack = stack_allocate(STACK_SIZE);
-       curr_thread->helpercontext.uc_stack.ss_sp = helperstack;
+       curr_thread->helper_stack = stack_allocate(STACK_SIZE);
+       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();
@@ -191,15 +216,28 @@ void * helper_thread(void * ptr) {
 
        model_swapcontext(&curr_thread->context, &curr_thread->helpercontext);
 
+
        //start the real thread
        thread_startup();
 
-       //now the real thread has control again
-       stack_free(helperstack);
-
        return NULL;
 }
 
+#ifdef TLS
+void tlsdestructor(void *v) {
+       uintptr_t count = (uintptr_t) v;
+       if (count > 1) {
+               if (pthread_setspecific(model->get_execution()->getPthreadKey(), (const void *)(count - 1))) {
+                       printf("Destructor setup failed\n");
+                       exit(-1);
+               }
+               return;
+       }
+       /* Finish thread properly */
+       model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+}
+#endif
+
 void setup_context() {
        Thread * curr_thread = thread_current();
 
@@ -248,10 +286,7 @@ int Thread::create_context()
        context.uc_stack.ss_flags = 0;
        context.uc_link = model->get_system_context();
 #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
@@ -306,10 +341,10 @@ void Thread::complete()
                stack_free(stack);
 #ifdef TLS
        if (this != model->getInitThread()) {
-               modellock = 1;
+               ASSERT(thread_current()==NULL);
                real_pthread_mutex_unlock(&mutex2);
                real_pthread_join(thread, NULL);
-               modellock = 0;
+               stack_free(helper_stack);
        }
 #endif
 }