Fix snapshot code

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index ae2905a9819a7d4e0159fbbf6d4f439850da1f40..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);
 }
 
 /**
@@ -151,13 +151,14 @@ 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),
        last_action_val(VALUE_NONE),
        model_thread(false)
@@ -169,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;
 }