X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=37b0f1a87ee6fb9ac975a84c8df9adf018d808c5;hb=970ac635b9f28be87f037da33f1e8ac57b89fd47;hp=e0cb277563bb057c989be29379866ac8f090094b;hpb=8c8e990efa97568549542133e13d9f4df375dd15;p=model-checker.git

diff --git a/threads.cc b/threads.cc
index e0cb277..37b0f1a 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"
 
@@ -12,12 +9,12 @@
 
 static void * stack_allocate(size_t size)
 {
-	return userMalloc(size);
+	return malloc(size);
 }
 
 static void stack_free(void *stack)
 {
-	userFree(stack);
+	free(stack);
 }
 
 Thread * thread_current(void)
@@ -25,6 +22,13 @@ Thread * thread_current(void)
 	return model->scheduler->get_current_thread();
 }
 
+/* This method just gets around makecontext not being 64-bit clean */
+
+void thread_startup() {
+	Thread * curr_thread = thread_current();
+	curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
 	int ret;
@@ -39,7 +43,7 @@ int Thread::create_context()
 	context.uc_stack.ss_size = STACK_SIZE;
 	context.uc_stack.ss_flags = 0;
 	context.uc_link = model->get_system_context();
-	makecontext(&context, start_routine, 1, arg);
+	makecontext(&context, thread_startup, 0);
 
 	return 0;
 }
@@ -64,15 +68,7 @@ void Thread::complete()
 	}
 }
 
-void * Thread::operator new(size_t size) {
-	return userMalloc(size);
-}
-
-void Thread::operator delete(void *ptr) {
-	userFree(ptr);
-}
-
-Thread::Thread(thrd_t *t, void (*func)(), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) {
 	int ret;
 
 	user_thread = t;
@@ -87,6 +83,7 @@ Thread::Thread(thrd_t *t, void (*func)(), void *a) {
 	state = THREAD_CREATED;
 	id = model->get_next_id();
 	*user_thread = id;
+	parent = thread_current();
 }
 
 Thread::~Thread()
@@ -99,67 +96,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();
-	if (curr) {
-		if (curr->get_state() == THREAD_READY) {
-			model->check_current_action();
-			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 Thread::swap(model->get_system_context(), next);
-}
-
-static void thread_wait_finish(void)
-{
-
-	DBG();
-
-	while (!thread_system_next());
-}
-
-/*
- * Main system function
- */
-int main()
-{
-	thrd_t user_thread;
-	ucontext_t main_context;
-
-	model = new ModelChecker();
-
-	if (getcontext(&main_context))
-		return 1;
-
-	model->set_system_context(&main_context);
-
-	do {
-		/* Start user program */
-		model->add_thread(new Thread(&user_thread, &user_main, NULL));
-
-		/* Wait for all threads to complete */
-		thread_wait_finish();
-	} while (model->next_execution());
-
-	delete model;
-
-	DEBUG("Exiting\n");
-	return 0;
-}