threads: set up Thread to be freed properly

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 4c2086d7ce7c74a82277aad853d845d345374a2a..7d4d22e7aafc68c2cf9e4332e9fceff7465ead46 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -53,11 +53,13 @@ int Thread::swap(Thread *t)
        return swapcontext(&this->context, &t->context);
 }
 
-void Thread::dispose()
+void Thread::complete()
 {
-       DEBUG("completed thread %d\n", thread_current()->get_id());
-       state = THREAD_COMPLETED;
-       stack_free(stack);
+       if (state != THREAD_COMPLETED) {
+               DEBUG("completed thread %d\n", get_id());
+               state = THREAD_COMPLETED;
+               stack_free(stack);
+       }
 }
 
 Thread::Thread(thrd_t *t, void (*func)(), void *a) {
@@ -73,8 +75,8 @@ 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;
 }
 
 Thread::Thread(thrd_t *t) {
@@ -84,14 +86,21 @@ Thread::Thread(thrd_t *t) {
        arg = NULL;
 
        state = THREAD_CREATED;
-       model->assign_id(this);
+       id = model->get_next_id();
+       *user_thread = id;
        create_context();
        model->add_system_thread(this);
 }
 
+Thread::~Thread()
+{
+       complete();
+       model->remove_thread(this);
+}
+
 thread_id_t Thread::get_id()
 {
-       return thrd_to_id(*user_thread);
+       return id;
 }
 
 /*
@@ -108,7 +117,7 @@ static int thread_system_next(void)
                        model->scheduler->add_thread(curr);
                else if (curr->get_state() == THREAD_RUNNING)
                        /* Stopped while running; i.e., completed */
-                       curr->dispose();
+                       curr->complete();
                else
                        DEBUG("ERROR: current thread in unexpected state??\n");
        }