threads: add per-thread "return" values for 'model-checking/user context' switch

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index d00e21228295b0f9bc7f86902a2a9bfcc2577947..b6eaee4ea18cb511b9d4e37edc78814669e152c8 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -9,16 +9,17 @@
 
 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)
 {
+       ASSERT(model);
        return model->scheduler->get_current_thread();
 }
 
@@ -68,7 +69,9 @@ void Thread::complete()
        }
 }
 
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+       last_action_val(VALUE_NONE)
+{
        int ret;
 
        user_thread = t;