tree: fix header for potential multiple inclusions

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 456414d5b3200ec1ca8b7603834e78c761910b76..d799144f67e1df86dcaacaa217da2f3f799b5cdd 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -12,12 +12,12 @@
 
 static void * stack_allocate(size_t size)
 {
-       return malloc(size);
+       return userMalloc(size);
 }
 
 static void stack_free(void *stack)
 {
-       free(stack);
+       userFree(stack);
 }
 
 Thread * thread_current(void)
@@ -33,24 +33,25 @@ int Thread::create_context()
        if (ret)
                return ret;
 
-       /* start_routine == NULL means this is our initial context */
-       if (!start_routine)
-               return 0;
-
        /* Initialize new managed context */
        stack = stack_allocate(STACK_SIZE);
        context.uc_stack.ss_sp = stack;
        context.uc_stack.ss_size = STACK_SIZE;
        context.uc_stack.ss_flags = 0;
-       context.uc_link = &model->system_thread->context;
+       context.uc_link = model->get_system_context();
        makecontext(&context, start_routine, 1, arg);
 
        return 0;
 }
 
-int Thread::swap(Thread *t)
+int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
-       return swapcontext(&this->context, &t->context);
+       return swapcontext(&t->context, ctxt);
+}
+
+int Thread::swap(ucontext_t *ctxt, Thread *t)
+{
+       return swapcontext(ctxt, &t->context);
 }
 
 void Thread::complete()
@@ -63,6 +64,14 @@ void Thread::complete()
        }
 }
 
+void * Thread::operator new(size_t size) {
+       return userMalloc(size);
+}
+
+void Thread::operator delete(void *ptr) {
+       userFree(ptr);
+}
+
 Thread::Thread(thrd_t *t, void (*func)(), void *a) {
        int ret;
 
@@ -80,20 +89,6 @@ Thread::Thread(thrd_t *t, void (*func)(), void *a) {
        *user_thread = id;
 }
 
-Thread::Thread(thrd_t *t) {
-       /* system thread */
-       user_thread = t;
-       start_routine = NULL;
-       arg = NULL;
-
-       create_context();
-       stack = NULL;
-       state = THREAD_CREATED;
-       id = model->get_next_id();
-       *user_thread = id;
-       model->add_system_thread(this);
-}
-
 Thread::~Thread()
 {
        complete();
@@ -113,11 +108,11 @@ static int thread_system_next(void)
        Thread *curr, *next;
 
        curr = thread_current();
-       model->check_current_action();
        if (curr) {
-               if (curr->get_state() == THREAD_READY)
+               if (curr->get_state() == THREAD_READY) {
+                       model->check_current_action();
                        model->scheduler->add_thread(curr);
-               else if (curr->get_state() == THREAD_RUNNING)
+               } else if (curr->get_state() == THREAD_RUNNING)
                        /* Stopped while running; i.e., completed */
                        curr->complete();
                else
@@ -129,7 +124,7 @@ static int thread_system_next(void)
        DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
        if (!next)
                return 1;
-       return model->system_thread->swap(next);
+       return Thread::swap(model->get_system_context(), next);
 }
 
 static void thread_wait_finish(void)
@@ -145,12 +140,15 @@ static void thread_wait_finish(void)
  */
 int main()
 {
-       thrd_t user_thread, main_thread;
-       Thread *th;
+       thrd_t user_thread;
+       ucontext_t main_context;
 
        model = new ModelChecker();
 
-       th = new Thread(&main_thread);
+       if (getcontext(&main_context))
+               return 1;
+
+       model->set_system_context(&main_context);
 
        do {
                /* Start user program */
@@ -160,7 +158,6 @@ int main()
                thread_wait_finish();
        } while (model->next_execution());
 
-       delete th;
        delete model;
 
        DEBUG("Exiting\n");