X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=7f515159f78052727180b1be6d82ba1df7e9ebac;hb=9db4729d3e6ab5f3ec5fd8a2560d95026332fecf;hp=7fa4507ee94397e7e092730567901de94cf07a46;hpb=d3b710fc183b8b71ab4726c2ae1b75caf13012b7;p=model-checker.git diff --git a/threads.cc b/threads.cc index 7fa4507..7f51515 100644 --- a/threads.cc +++ b/threads.cc @@ -2,6 +2,8 @@ * @brief Thread functions. */ +#include + #include "libthreads.h" #include "common.h" #include "threads.h" @@ -12,13 +14,13 @@ /** Allocate a stack for a new thread. */ static void * stack_allocate(size_t size) { - return malloc(size); + return snapshot_malloc(size); } /** Free a stack for a terminated thread. */ static void stack_free(void *stack) { - free(stack); + snapshot_free(stack); } /** Return the currently executing thread. */ @@ -105,13 +107,38 @@ int Thread::swap(ucontext_t *ctxt, Thread *t) void Thread::complete() { if (!is_complete()) { - DEBUG("completed thread %d\n", get_id()); + DEBUG("completed thread %d\n", id_to_int(get_id())); state = THREAD_COMPLETED; if (stack) stack_free(stack); } } +/** + * @brief Construct a new model-checker Thread + * + * A model-checker Thread is used for accounting purposes only. It will never + * have its own stack, and it should never be inserted into the Scheduler. + * + * @param tid The thread ID to assign + */ +Thread::Thread(thread_id_t tid) : + parent(NULL), + creation(NULL), + pending(NULL), + start_routine(NULL), + arg(NULL), + stack(NULL), + user_thread(NULL), + id(tid), + state(THREAD_READY), /* Thread is always ready? */ + wait_list(), + last_action_val(0), + model_thread(true) +{ + memset(&context, 0, sizeof(context)); +} + /** * Construct a new thread. * @param t The thread identifier of the newly created thread. @@ -119,12 +146,15 @@ void Thread::complete() * @param a The parameter to pass to this function. */ Thread::Thread(thrd_t *t, void (*func)(void *), void *a) : + creation(NULL), + pending(NULL), start_routine(func), arg(a), user_thread(t), state(THREAD_CREATED), wait_list(), - last_action_val(VALUE_NONE) + last_action_val(VALUE_NONE), + model_thread(false) { int ret;