X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=threads.cc;h=762bbff34c2463a3dbaf6179e3af3e1eb977ca8b;hp=87de32fb2452f0384016353306b0b0b43c3d4cea;hb=8afe95aa67927b0afde92acb88956e6c1c952985;hpb=a330eb33b1b62dfa71f3f0cb055367a30090c180

diff --git a/threads.cc b/threads.cc
index 87de32f..762bbff 100644
--- a/threads.cc
+++ b/threads.cc
@@ -7,6 +7,7 @@
 #include <threads.h>
 #include "common.h"
 #include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"
@@ -23,7 +24,13 @@ static void stack_free(void *stack)
 	snapshot_free(stack);
 }
 
-/** Return the currently executing thread. */
+/**
+ * @brief Get the current Thread
+ *
+ * Must be called from a user context
+ *
+ * @return The currently executing thread
+ */
 Thread * thread_current(void)
 {
 	ASSERT(model);
@@ -84,6 +91,7 @@ int Thread::create_context()
  */
 int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
+	t->set_state(THREAD_READY);
 	return swapcontext(&t->context, ctxt);
 }
 
@@ -97,6 +105,7 @@ int Thread::swap(Thread *t, ucontext_t *ctxt)
  */
 int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
+	t->set_state(THREAD_RUNNING);
 	return swapcontext(ctxt, &t->context);
 }
 
@@ -104,12 +113,11 @@ int Thread::swap(ucontext_t *ctxt, Thread *t)
 /** Terminate a thread and free its stack. */
 void Thread::complete()
 {
-	if (!is_complete()) {
-		DEBUG("completed thread %d\n", id_to_int(get_id()));
-		state = THREAD_COMPLETED;
-		if (stack)
-			stack_free(stack);
-	}
+	ASSERT(!is_complete());
+	DEBUG("completed thread %d\n", id_to_int(get_id()));
+	state = THREAD_COMPLETED;
+	if (stack)
+		stack_free(stack);
 }
 
 /**
@@ -143,7 +151,8 @@ 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::Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
+	parent(parent),
 	creation(NULL),
 	pending(NULL),
 	start_routine(func),
@@ -162,14 +171,14 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
 		model_print("Error in create_context\n");
 
 	id = model->get_next_id();
-	*user_thread = id;
-	parent = thread_current();
+	user_thread->priv = this;
 }
 
 /** Destructor */
 Thread::~Thread()
 {
-	complete();
+	if (!is_complete())
+		complete();
 	model->remove_thread(this);
 }