X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=ca4b28b1bc850c9ea5bcab709e2d27a9e74e2581;hb=d4f6c8b91fb6c85bbb5d2ba3477c14fc10383c44;hp=9b7954d9386b6f5390ed42a32b43a53f5f5f1ca7;hpb=3519c47202090f3c4a69de0e89aaa2617b17ff75;p=model-checker.git

diff --git a/threads.cc b/threads.cc
index 9b7954d..ca4b28b 100644
--- a/threads.cc
+++ b/threads.cc
@@ -12,13 +12,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. */
@@ -44,6 +44,9 @@ void thread_startup()
 
 	/* Call the actual thread function */
 	curr_thread->start_routine(curr_thread->arg);
+
+	/* Finish thread properly */
+	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 }
 
 /**
@@ -101,8 +104,8 @@ int Thread::swap(ucontext_t *ctxt, Thread *t)
 /** Terminate a thread and free its stack. */
 void Thread::complete()
 {
-	if (state != THREAD_COMPLETED) {
-		DEBUG("completed thread %d\n", get_id());
+	if (!is_complete()) {
+		DEBUG("completed thread %d\n", id_to_int(get_id()));
 		state = THREAD_COMPLETED;
 		if (stack)
 			stack_free(stack);
@@ -116,10 +119,13 @@ 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)
 {
 	int ret;