Experimental TLS support.

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 5bfd028746aa99f314263d90d4f7234df629b63b..6c7b89028e520d156ab6824a75648ca5aabe5d16 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -5,24 +5,43 @@
 #include <string.h>
 
 #include <threads.h>
-#include <mutex>
+#include "mutex.h"
 #include "common.h"
 #include "threads-model.h"
 #include "action.h"
 
 /* global "model" object */
 #include "model.h"
+#include "execution.h"
+
+#ifdef TLS
+uintptr_t get_tls_addr() {
+       uintptr_t addr;
+       asm ("mov %%fs:0, %0" : "=r" (addr));
+       return addr;
+}
+
+#include <asm/prctl.h>
+#include <sys/prctl.h>
+extern "C" {
+int arch_prctl(int code, unsigned long addr);
+}
+static void set_tls_addr(uintptr_t addr) {
+       arch_prctl(ARCH_SET_FS, addr);
+       asm ("mov %0, %%fs:0" : : "r" (addr) : "memory");
+}
+#endif
 
 /** Allocate a stack for a new thread. */
 static void * stack_allocate(size_t size)
 {
-       return snapshot_malloc(size);
+       return Thread_malloc(size);
 }
 
 /** Free a stack for a terminated thread. */
 static void stack_free(void *stack)
 {
-       snapshot_free(stack);
+       Thread_free(stack);
 }
 
 /**
@@ -50,9 +69,25 @@ void thread_startup()
        /* 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));
 
-       /* Call the actual thread function */
-       curr_thread->start_routine(curr_thread->arg);
+#ifdef TLS
+       if (curr_thread->tls == NULL) {
+               uintptr_t tlssize = model->get_execution()->getTLSSize();
+               uintptr_t thddesc = model->get_execution()->getThdDescSize();
+               curr_thread->tls = (char*) Thread_malloc(tlssize);
+               memcpy(curr_thread->tls, model->get_execution()->getTLSBase(), tlssize);
+               curr_thread->tls += tlssize - thddesc;
+               set_tls_addr((uintptr_t)curr_thread->tls);
+       }
+#endif
 
+       /* Call the actual thread function */
+       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));
 }
@@ -93,7 +128,10 @@ int Thread::create_context()
 int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
        t->set_state(THREAD_READY);
-       return swapcontext(&t->context, ctxt);
+#ifdef TLS
+       set_tls_addr((uintptr_t)model->getInitThread()->tls);
+#endif
+       return model_swapcontext(&t->context, ctxt);
 }
 
 /**
@@ -107,7 +145,11 @@ int Thread::swap(Thread *t, ucontext_t *ctxt)
 int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
        t->set_state(THREAD_RUNNING);
-       return swapcontext(ctxt, &t->context);
+#ifdef TLS
+       if (t->tls != NULL)
+               set_tls_addr((uintptr_t)t->tls);
+#endif
+       return model_swapcontext(ctxt, &t->context);
 }
 
 
@@ -119,6 +161,11 @@ void Thread::complete()
        state = THREAD_COMPLETED;
        if (stack)
                stack_free(stack);
+#ifdef TLS
+       if (tls && get_id() != 1)
+               tls += model->get_execution()->getTLSSize() - model->get_execution()->getThdDescSize();
+       Thread_free(tls);
+#endif
 }
 
 /**
@@ -136,9 +183,12 @@ Thread::Thread(thread_id_t tid) :
        start_routine(NULL),
        arg(NULL),
        stack(NULL),
+#ifdef TLS
+       tls(NULL),
+#endif
        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)
 {
@@ -151,13 +201,18 @@ Thread::Thread(thread_id_t tid) :
  * @param func The function that the thread will call.
  * @param a The parameter to pass to this function.
  */
-Thread::Thread(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),
        start_routine(func),
+       pstart_routine(NULL),
        arg(a),
+#ifdef TLS
+       tls(NULL),
+#endif
        user_thread(t),
+       id(tid),
        state(THREAD_CREATED),
        last_action_val(VALUE_NONE),
        model_thread(false)
@@ -169,10 +224,40 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
        if (ret)
                model_print("Error in create_context\n");
 
-       id = model->get_next_id();
-       user_thread->priv = this;
+       user_thread->priv = this;       // WL
+}
+
+/**
+ * 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) :
+       parent(parent),
+       creation(NULL),
+       pending(NULL),
+       start_routine(NULL),
+       pstart_routine(func),
+       arg(a),
+#ifdef TLS
+       tls(NULL),
+#endif
+       user_thread(t),
+       id(tid),
+       state(THREAD_CREATED),
+       last_action_val(VALUE_NONE),
+       model_thread(false)
+{
+       int ret;
+
+       /* Initialize state */
+       ret = create_context();
+       if (ret)
+               model_print("Error in create_context\n");
 }
 
+
 /** Destructor */
 Thread::~Thread()
 {
@@ -207,6 +292,8 @@ Thread * Thread::waiting_on() const
 
        if (pending->get_type() == THREAD_JOIN)
                return pending->get_thread_operand();
+       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;
@@ -222,7 +309,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;