Fix snapshot code

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index e4b46561a0e7be13016661a541f09146b9726f28..a06af84636978f1bbd31f960c0c2368d79fc609a 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -16,13 +16,13 @@
 /** Allocate a stack for a new thread. */
 static void * stack_allocate(size_t size)
 {
-       return snapshot_malloc(size);
+       return Thread_malloc(size);
 }
 
 /** Free a stack for a terminated thread. */
 static void stack_free(void *stack)
 {
-       snapshot_free(stack);
+       Thread_free(stack);
 }
 
 /**
@@ -93,7 +93,7 @@ int Thread::create_context()
 int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
        t->set_state(THREAD_READY);
-       return swapcontext(&t->context, ctxt);
+       return model_swapcontext(&t->context, ctxt);
 }
 
 /**
@@ -107,7 +107,7 @@ int Thread::swap(Thread *t, ucontext_t *ctxt)
 int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
        t->set_state(THREAD_RUNNING);
-       return swapcontext(ctxt, &t->context);
+       return model_swapcontext(ctxt, &t->context);
 }
 
 
@@ -139,7 +139,6 @@ Thread::Thread(thread_id_t tid) :
        user_thread(NULL),
        id(tid),
        state(THREAD_READY), /* Thread is always ready? */
-       wait_list(),
        last_action_val(0),
        model_thread(true)
 {
@@ -152,15 +151,15 @@ Thread::Thread(thread_id_t tid) :
  * @param func The function that the thread will call.
  * @param a The parameter to pass to this function.
  */
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
+Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
        parent(parent),
        creation(NULL),
        pending(NULL),
        start_routine(func),
        arg(a),
        user_thread(t),
+       id(tid),
        state(THREAD_CREATED),
-       wait_list(),
        last_action_val(VALUE_NONE),
        model_thread(false)
 {
@@ -171,7 +170,6 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
        if (ret)
                model_print("Error in create_context\n");
 
-       id = model->get_next_id();
        user_thread->priv = this;
 }