toss a place for useful information

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 99297749a800987b48a157570daf0820aeb5715d..6a9391f0302467097b415bf4b129eb1b90fffaa5 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -9,19 +9,35 @@
 
 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();
 }
 
+/**
+ * Provides a startup wrapper for each thread, allowing some initial
+ * model-checking data to be recorded. This method also gets around makecontext
+ * not being 64-bit clean
+ */
+void thread_startup() {
+       Thread * curr_thread = thread_current();
+
+       /* Add dummy "start" action, just to create a first clock vector */
+       model->switch_to_master(new ModelAction(THREAD_START, memory_order_seq_cst, curr_thread));
+
+       /* Call the actual thread function */
+       curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
        int ret;
@@ -36,7 +52,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,20 +77,20 @@ void Thread::complete()
        }
 }
 
-
-Thread::Thread(thrd_t *t, void (*func)(), 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();