Add default memory allocation and free functions for HSIterator and some other tiny...

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 8b3e0c6191ae7c9333c11fcafff83570819c4863..0da9282aa942bd2966bf939d6409636fa99049e5 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>
@@ -92,7 +93,6 @@ void thread_startup()
        model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 }
 
-#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 +123,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 +166,17 @@ void real_init_all() {
                        exit(EXIT_FAILURE);
                }
        }
+
+       if (!pthread_exit_p) {
+               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);
@@ -305,10 +320,15 @@ void Thread::complete()
        if (stack)
                stack_free(stack);
 #ifdef TLS
-       if (this != model->getInitThread()) {
+       if (this != model->getInitThread() && !model->getParams()->threadsnocleanup) {
                modellock = 1;
+               ASSERT(thread_current()==NULL);
+               Thread * curr_thread = model->getScheduler()->get_current_thread();
+               //Make any current_thread calls work in code to free
+               model->getScheduler()->set_current_thread(this);
                real_pthread_mutex_unlock(&mutex2);
                real_pthread_join(thread, NULL);
+               model->getScheduler()->set_current_thread(curr_thread);
                modellock = 0;
        }
 #endif