clockvector: fix 'happens_before', change name to 'synchronized_since'

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 99297749a800987b48a157570daf0820aeb5715d..37b0f1a87ee6fb9ac975a84c8df9adf018d808c5 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -9,12 +9,12 @@
 
 static void * stack_allocate(size_t size)
 {
-       return userMalloc(size);
+       return malloc(size);
 }
 
 static void stack_free(void *stack)
 {
-       userFree(stack);
+       free(stack);
 }
 
 Thread * thread_current(void)
@@ -22,6 +22,13 @@ Thread * thread_current(void)
        return model->scheduler->get_current_thread();
 }
 
+/* This method just gets around makecontext not being 64-bit clean */
+
+void thread_startup() {
+       Thread * curr_thread = thread_current();
+       curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
        int ret;
@@ -36,7 +43,7 @@ int Thread::create_context()
        context.uc_stack.ss_size = STACK_SIZE;
        context.uc_stack.ss_flags = 0;
        context.uc_link = model->get_system_context();
-       makecontext(&context, start_routine, 1, arg);
+       makecontext(&context, thread_startup, 0);
 
        return 0;
 }
@@ -61,8 +68,7 @@ void Thread::complete()
        }
 }
 
-
-Thread::Thread(thrd_t *t, void (*func)(), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) {
        int ret;
 
        user_thread = t;