X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=dc2db2d9bfefcab57458035f3f4bc815b75b5fc5;hb=24edf5ea28ecd116c1faa76ed41de1cfbf6d6d1e;hp=9b7954d9386b6f5390ed42a32b43a53f5f5f1ca7;hpb=08b069a092910d66bab08096177d9f97461725e4;p=model-checker.git

diff --git a/threads.cc b/threads.cc
index 9b7954d..dc2db2d 100644
--- a/threads.cc
+++ b/threads.cc
@@ -2,9 +2,11 @@
  *  @brief Thread functions.
  */
 
-#include "libthreads.h"
+#include <string.h>
+
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /* global "model" object */
 #include "model.h"
@@ -12,13 +14,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 +46,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,14 +106,39 @@ 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);
 	}
 }
 
+/**
+ * @brief Construct a new model-checker Thread
+ *
+ * A model-checker Thread is used for accounting purposes only. It will never
+ * have its own stack, and it should never be inserted into the Scheduler.
+ *
+ * @param tid The thread ID to assign
+ */
+Thread::Thread(thread_id_t tid) :
+	parent(NULL),
+	creation(NULL),
+	pending(NULL),
+	start_routine(NULL),
+	arg(NULL),
+	stack(NULL),
+	user_thread(NULL),
+	id(tid),
+	state(THREAD_READY), /* Thread is always ready? */
+	wait_list(),
+	last_action_val(0),
+	model_thread(true)
+{
+	memset(&context, 0, sizeof(context));
+}
+
 /**
  * Construct a new thread.
  * @param t The thread identifier of the newly created thread.
@@ -116,11 +146,15 @@ 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),
-	last_action_val(VALUE_NONE)
+	wait_list(),
+	last_action_val(VALUE_NONE),
+	model_thread(false)
 {
 	int ret;