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

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 35000dc17d2ad40f73ea3652f0b634dd9f95678b..37b0f1a87ee6fb9ac975a84c8df9adf018d808c5 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -1,5 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t -*- */
-
 #include "libthreads.h"
 #include "common.h"
 #include "threads.h"
@@ -11,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)
@@ -27,7 +25,7 @@ Thread * thread_current(void)
 /* This method just gets around makecontext not being 64-bit clean */
 
 void thread_startup() {
-       Thread * curr_thread=thread_current();
+       Thread * curr_thread = thread_current();
        curr_thread->start_routine(curr_thread->arg);
 }