fix code to be 64 bit clean

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 830ea1a484159c9df61b641994781d30f97cb989..0ed7bdcabc084eabf0755c8df098b724d3c023c4 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -1,7 +1,6 @@
-#include <stdlib.h>
+/* -*- Mode: C; indent-tabs-mode: t -*- */
 
 #include "libthreads.h"
-#include "schedule.h"
 #include "common.h"
 #include "threads.h"
 
@@ -10,21 +9,28 @@
 
 #define STACK_SIZE (1024 * 1024)
 
-static void *stack_allocate(size_t size)
+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)
+Thread * thread_current(void)
 {
        return model->scheduler->get_current_thread();
 }
 
+/* This method just gets around makecontext not being 64-bit clean */
+
+void thread_startup() {
+       Thread * curr_thread=thread_current();
+       curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
        int ret;
@@ -33,31 +39,35 @@ 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;
-       makecontext(&context, start_routine, 1, arg);
+       context.uc_link = model->get_system_context();
+       makecontext(&context, start_routine, 1);
 
        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);
 }
 
-void Thread::dispose()
+int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
-       DEBUG("completed thread %d\n", thread_current()->get_id());
-       state = THREAD_COMPLETED;
-       stack_free(stack);
+       return swapcontext(ctxt, &t->context);
+}
+
+void Thread::complete()
+{
+       if (state != THREAD_COMPLETED) {
+               DEBUG("completed thread %d\n", get_id());
+               state = THREAD_COMPLETED;
+               if (stack)
+                       stack_free(stack);
+       }
 }
 
 Thread::Thread(thrd_t *t, void (*func)(), void *a) {
@@ -73,84 +83,18 @@ Thread::Thread(thrd_t *t, void (*func)(), void *a) {
                printf("Error in create_context\n");
 
        state = THREAD_CREATED;
-       model->assign_id(this);
-       model->scheduler->add_thread(this);
+       id = model->get_next_id();
+       *user_thread = id;
+       parent = thread_current();
 }
 
-Thread::Thread(thrd_t *t) {
-       /* system thread */
-       user_thread = t;
-       state = THREAD_CREATED;
-       model->assign_id(this);
-       create_context();
-       model->add_system_thread(this);
-}
-
-thread_id_t Thread::get_id()
+Thread::~Thread()
 {
-       return thrd_to_id(*user_thread);
+       complete();
+       model->remove_thread(this);
 }
 
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-static int thread_system_next(void)
-{
-       Thread *curr, *next;
-
-       curr = thread_current();
-       model->check_current_action();
-       if (curr) {
-               if (curr->get_state() == THREAD_READY)
-                       model->scheduler->add_thread(curr);
-               else if (curr->get_state() == THREAD_RUNNING)
-                       /* Stopped while running; i.e., completed */
-                       curr->dispose();
-               else
-                       DEBUG("ERROR: current thread in unexpected state??\n");
-       }
-       next = model->scheduler->next_thread();
-       if (next)
-               next->set_state(THREAD_RUNNING);
-       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-       if (!next)
-               return 1;
-       return model->system_thread->swap(next);
-}
-
-static void thread_wait_finish(void)
-{
-
-       DBG();
-
-       while (!thread_system_next());
-}
-
-/*
- * Main system function
- */
-int main()
+thread_id_t Thread::get_id()
 {
-       thrd_t user_thread, main_thread;
-       Thread *th;
-
-       model = new ModelChecker();
-
-       th = new Thread(&main_thread);
-
-       do {
-               /* Start user program */
-               thrd_create(&user_thread, &user_main, NULL);
-
-               /* Wait for all threads to complete */
-               thread_wait_finish();
-
-               model->print_trace();
-       } while (model->next_execution());
-
-       delete th;
-       delete model;
-
-       DEBUG("Exiting\n");
-       return 0;
+       return id;
 }