Change initialize a bit

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index a2d2ed166ba3350400e6e5c13cb9b897fdad628a..e22ffa3221f83ae1f95abb5b7b6c63da04c72183 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -60,14 +60,27 @@ Thread * thread_current(void)
        return model->get_current_thread();
 }
 
+/**
+ * @brief Get the current Thread id
+ *
+ * Must be called from a user context
+ *
+ * @return The id of the currently executing thread
+ */
+thread_id_t thread_current_id(void)
+{
+       ASSERT(model);
+       return model->get_current_thread_id();
+}
+
 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()));
 }
 
 void initMainThread() {
        atexit(modelexit);
        Thread * curr_thread = thread_current();
-       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));
 }
 
 /**
@@ -80,7 +93,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 */
@@ -93,7 +106,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
 }
 
@@ -212,7 +225,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);
@@ -235,7 +248,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
 
@@ -243,7 +256,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();
 
@@ -285,7 +298,7 @@ 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
        makecontext(&context, setup_context, 0);
 #else
@@ -331,23 +344,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;
 
-/** Terminate a thread and free its stack. */
+#ifdef TLS
+       if (t2->tls != NULL)
+               set_tls_addr((uintptr_t)t2->tls);
+#endif
+       return model_swapcontext(&t->context, &t2->context);
+}
+
+/** 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()) {
-               ASSERT(thread_current()==NULL);
                real_pthread_mutex_unlock(&mutex2);
                real_pthread_join(thread, NULL);
                stack_free(helper_stack);
        }
 #endif
+       state = THREAD_FREED;
 }
 
 /**
@@ -363,6 +391,7 @@ Thread::Thread(thread_id_t tid) :
        acq_fence_cv(new ClockVector()),
        creation(NULL),
        pending(NULL),
+       wakeup_state(false),
        start_routine(NULL),
        arg(NULL),
        stack(NULL),
@@ -389,6 +418,7 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread
        acq_fence_cv(new ClockVector()),
        creation(NULL),
        pending(NULL),
+       wakeup_state(false),
        start_routine(func),
        pstart_routine(NULL),
        arg(a),
@@ -422,6 +452,7 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Threa
        acq_fence_cv(new ClockVector()),
        creation(NULL),
        pending(NULL),
+       wakeup_state(false),
        start_routine(NULL),
        pstart_routine(func),
        arg(a),
@@ -477,13 +508,15 @@ Thread * Thread::waiting_on() const
        if (!pending)
                return NULL;
 
-       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;
+       switch (pending->get_type()) {
+               case THREAD_JOIN:
+               case PTHREAD_JOIN:
+                       return pending->get_thread_operand();
+               case ATOMIC_LOCK:
+                       return (Thread *)pending->get_mutex()->get_state()->locked;
+               default:
+                       return NULL;
+       }
 }
 
 /**
@@ -496,6 +529,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;