X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=6a9391f0302467097b415bf4b129eb1b90fffaa5;hb=dd0190cef49ef760f8d86a6e92dd6eeb07197854;hp=7e23f59dcf902fd4693e9fea34e81439e7a518ef;hpb=514298ff6ed5841ee771673e7f58885ade0c700e;p=c11tester.git

diff --git a/threads.cc b/threads.cc
index 7e23f59d..6a9391f0 100644
--- a/threads.cc
+++ b/threads.cc
@@ -1,7 +1,4 @@
-#include <stdlib.h>
-
 #include "libthreads.h"
-#include "schedule.h"
 #include "common.h"
 #include "threads.h"
 
@@ -22,9 +19,25 @@ static void stack_free(void *stack)
 
 Thread * thread_current(void)
 {
+	ASSERT(model);
 	return model->scheduler->get_current_thread();
 }
 
+/**
+ * Provides a startup wrapper for each thread, allowing some initial
+ * model-checking data to be recorded. This method also gets around makecontext
+ * not being 64-bit clean
+ */
+void thread_startup() {
+	Thread * curr_thread = thread_current();
+
+	/* Add dummy "start" action, just to create a first clock vector */
+	model->switch_to_master(new ModelAction(THREAD_START, memory_order_seq_cst, curr_thread));
+
+	/* Call the actual thread function */
+	curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
 	int ret;
@@ -33,24 +46,25 @@ int Thread::create_context()
 	if (ret)
 		return ret;
 
-	/* start_routine == NULL means this is our initial context */
-	if (!start_routine)
-		return 0;
-
 	/* Initialize new managed context */
 	stack = stack_allocate(STACK_SIZE);
 	context.uc_stack.ss_sp = stack;
 	context.uc_stack.ss_size = STACK_SIZE;
 	context.uc_stack.ss_flags = 0;
-	context.uc_link = &model->system_thread->context;
-	makecontext(&context, start_routine, 1, arg);
+	context.uc_link = model->get_system_context();
+	makecontext(&context, thread_startup, 0);
 
 	return 0;
 }
 
-int Thread::swap(Thread *t)
+int Thread::swap(Thread *t, ucontext_t *ctxt)
+{
+	return swapcontext(&t->context, ctxt);
+}
+
+int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
-	return swapcontext(&this->context, &t->context);
+	return swapcontext(ctxt, &t->context);
 }
 
 void Thread::complete()
@@ -63,35 +77,23 @@ void Thread::complete()
 	}
 }
 
-Thread::Thread(thrd_t *t, void (*func)(), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+	start_routine(func),
+	arg(a),
+	user_thread(t),
+	state(THREAD_CREATED),
+	last_action_val(VALUE_NONE)
+{
 	int ret;
 
-	user_thread = t;
-	start_routine = func;
-	arg = a;
-
 	/* Initialize state */
 	ret = create_context();
 	if (ret)
 		printf("Error in create_context\n");
 
-	state = THREAD_CREATED;
-	id = model->get_next_id();
-	*user_thread = id;
-}
-
-Thread::Thread(thrd_t *t) {
-	/* system thread */
-	user_thread = t;
-	start_routine = NULL;
-	arg = NULL;
-
-	create_context();
-	stack = NULL;
-	state = THREAD_CREATED;
 	id = model->get_next_id();
 	*user_thread = id;
-	model->add_system_thread(this);
+	parent = thread_current();
 }
 
 Thread::~Thread()
@@ -104,67 +106,3 @@ thread_id_t Thread::get_id()
 {
 	return id;
 }
-
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-static int thread_system_next(void)
-{
-	Thread *curr, *next;
-
-	curr = thread_current();
-	model->check_current_action();
-	if (curr) {
-		if (curr->get_state() == THREAD_READY)
-			model->scheduler->add_thread(curr);
-		else if (curr->get_state() == THREAD_RUNNING)
-			/* Stopped while running; i.e., completed */
-			curr->complete();
-		else
-			DEBUG("ERROR: current thread in unexpected state??\n");
-	}
-	next = model->scheduler->next_thread();
-	if (next)
-		next->set_state(THREAD_RUNNING);
-	DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-	if (!next)
-		return 1;
-	return model->system_thread->swap(next);
-}
-
-static void thread_wait_finish(void)
-{
-
-	DBG();
-
-	while (!thread_system_next());
-}
-
-/*
- * Main system function
- */
-int main()
-{
-	thrd_t user_thread, main_thread;
-	Thread *th;
-
-	model = new ModelChecker();
-
-	th = new Thread(&main_thread);
-
-	do {
-		/* Start user program */
-		thrd_create(&user_thread, &user_main, NULL);
-
-		/* Wait for all threads to complete */
-		thread_wait_finish();
-
-		model->print_trace();
-	} while (model->next_execution());
-
-	delete th;
-	delete model;
-
-	DEBUG("Exiting\n");
-	return 0;
-}