threads: use constructor initializer list

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 80957adf7b1709c015b4a30bc82deacc98767b92..ba7b54730781369fd6c17ec9f4bc492d660b3843 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -9,23 +9,24 @@
 
 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();
 }
 
 /* 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);
 }
 
@@ -68,19 +69,20 @@ void Thread::complete()
        }
 }
 
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+       start_routine(func),
+       arg(a),
+       user_thread(t),
+       state(THREAD_CREATED),
+       last_action_val(VALUE_NONE)
+{
        int ret;
 
-       user_thread = t;
-       start_routine = func;
-       arg = a;
-
        /* Initialize state */
        ret = create_context();
        if (ret)
                printf("Error in create_context\n");
 
-       state = THREAD_CREATED;
        id = model->get_next_id();
        *user_thread = id;
        parent = thread_current();