X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=dd2a59832027557b543d8fd606f842527b270f97;hb=6c50e3a2f6975a2f5c225351eb33218fcfefa1e7;hp=09efcae619c06b78ed5c2668473c2b8143b9ea71;hpb=328a2c09c2ee06d0e1c49ccb84877fa17b436a01;p=c11tester.git

diff --git a/threads.cc b/threads.cc
index 09efcae6..dd2a5983 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"
@@ -105,13 +107,38 @@ int Thread::swap(ucontext_t *ctxt, Thread *t)
 void Thread::complete()
 {
 	if (!is_complete()) {
-		DEBUG("completed thread %d\n", get_id());
+		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.
@@ -126,14 +153,15 @@ Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
 	user_thread(t),
 	state(THREAD_CREATED),
 	wait_list(),
-	last_action_val(VALUE_NONE)
+	last_action_val(VALUE_NONE),
+	model_thread(false)
 {
 	int ret;
 
 	/* Initialize state */
 	ret = create_context();
 	if (ret)
-		printf("Error in create_context\n");
+		model_print("Error in create_context\n");
 
 	id = model->get_next_id();
 	*user_thread = id;