X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads.cc;h=6c7b89028e520d156ab6824a75648ca5aabe5d16;hp=09efcae619c06b78ed5c2668473c2b8143b9ea71;hb=11349f4e83c1446d5c678384a7d45e410c82c3e2;hpb=e00292b5adf2b85eb1c6e2399159b5c28fde48eb

diff --git a/threads.cc b/threads.cc
index 09efcae6..6c7b8902 100644
--- a/threads.cc
+++ b/threads.cc
@@ -2,26 +2,55 @@
  *  @brief Thread functions.
  */
 
-#include "libthreads.h"
+#include <string.h>
+
+#include <threads.h>
+#include "mutex.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"
+#include "execution.h"
+
+#ifdef TLS
+uintptr_t get_tls_addr() {
+	uintptr_t addr;
+	asm ("mov %%fs:0, %0" : "=r" (addr));
+	return addr;
+}
+
+#include <asm/prctl.h>
+#include <sys/prctl.h>
+extern "C" {
+int arch_prctl(int code, unsigned long addr);
+}
+static void set_tls_addr(uintptr_t addr) {
+	arch_prctl(ARCH_SET_FS, addr);
+	asm ("mov %0, %%fs:0" : : "r" (addr) : "memory");
+}
+#endif
 
 /** Allocate a stack for a new thread. */
 static void * stack_allocate(size_t size)
 {
-	return snapshot_malloc(size);
+	return Thread_malloc(size);
 }
 
 /** Free a stack for a terminated thread. */
 static void stack_free(void *stack)
 {
-	snapshot_free(stack);
+	Thread_free(stack);
 }
 
-/** Return the currently executing thread. */
+/**
+ * @brief Get the current Thread
+ *
+ * Must be called from a user context
+ *
+ * @return The currently executing thread
+ */
 Thread * thread_current(void)
 {
 	ASSERT(model);
@@ -32,8 +61,6 @@ Thread * thread_current(void)
  * 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
- * @todo We should make the START event always immediately follow the
- * CREATE event, so we don't get redundant traces...
  */
 void thread_startup()
 {
@@ -42,9 +69,25 @@ void thread_startup()
 	/* Add dummy "start" action, just to create a first clock vector */
 	model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
 
-	/* Call the actual thread function */
-	curr_thread->start_routine(curr_thread->arg);
+#ifdef TLS
+	if (curr_thread->tls == NULL) {
+		uintptr_t tlssize = model->get_execution()->getTLSSize();
+		uintptr_t thddesc = model->get_execution()->getThdDescSize();
+		curr_thread->tls = (char*) Thread_malloc(tlssize);
+		memcpy(curr_thread->tls, model->get_execution()->getTLSBase(), tlssize);
+		curr_thread->tls += tlssize - thddesc;
+		set_tls_addr((uintptr_t)curr_thread->tls);
+	}
+#endif
 
+	/* Call the actual thread function */
+	if (curr_thread->start_routine != NULL) {
+		curr_thread->start_routine(curr_thread->arg);
+	} else if (curr_thread->pstart_routine != NULL) {
+		// set pthread return value
+		void *retval = curr_thread->pstart_routine(curr_thread->arg);
+		curr_thread->set_pthread_return(retval);
+	}
 	/* Finish thread properly */
 	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
 }
@@ -84,7 +127,11 @@ int Thread::create_context()
  */
 int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
-	return swapcontext(&t->context, ctxt);
+	t->set_state(THREAD_READY);
+#ifdef TLS
+	set_tls_addr((uintptr_t)model->getInitThread()->tls);
+#endif
+	return model_swapcontext(&t->context, ctxt);
 }
 
 /**
@@ -97,19 +144,55 @@ int Thread::swap(Thread *t, ucontext_t *ctxt)
  */
 int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
-	return swapcontext(ctxt, &t->context);
+	t->set_state(THREAD_RUNNING);
+#ifdef TLS
+	if (t->tls != NULL)
+		set_tls_addr((uintptr_t)t->tls);
+#endif
+	return model_swapcontext(ctxt, &t->context);
 }
 
 
 /** Terminate a thread and free its stack. */
 void Thread::complete()
 {
-	if (!is_complete()) {
-		DEBUG("completed thread %d\n", get_id());
-		state = THREAD_COMPLETED;
-		if (stack)
-			stack_free(stack);
-	}
+	ASSERT(!is_complete());
+	DEBUG("completed thread %d\n", id_to_int(get_id()));
+	state = THREAD_COMPLETED;
+	if (stack)
+		stack_free(stack);
+#ifdef TLS
+	if (tls && get_id() != 1)
+		tls += model->get_execution()->getTLSSize() - model->get_execution()->getThdDescSize();
+	Thread_free(tls);
+#endif
+}
+
+/**
+ * @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),
+#ifdef TLS
+	tls(NULL),
+#endif
+	user_thread(NULL),
+	id(tid),
+	state(THREAD_READY),	/* Thread is always ready? */
+	last_action_val(0),
+	model_thread(true)
+{
+	memset(&context, 0, sizeof(context));
 }
 
 /**
@@ -118,37 +201,116 @@ void Thread::complete()
  * @param func The function that the thread will call.
  * @param a The parameter to pass to this function.
  */
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
+	parent(parent),
 	creation(NULL),
 	pending(NULL),
 	start_routine(func),
+	pstart_routine(NULL),
 	arg(a),
+#ifdef TLS
+	tls(NULL),
+#endif
 	user_thread(t),
+	id(tid),
 	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;
-	parent = thread_current();
+	user_thread->priv = this;	// WL
 }
 
+/**
+ * Construct a new thread for pthread.
+ * @param t The thread identifier of the newly created thread.
+ * @param func The function that the thread will call.
+ * @param a The parameter to pass to this function.
+ */
+Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent) :
+	parent(parent),
+	creation(NULL),
+	pending(NULL),
+	start_routine(NULL),
+	pstart_routine(func),
+	arg(a),
+#ifdef TLS
+	tls(NULL),
+#endif
+	user_thread(t),
+	id(tid),
+	state(THREAD_CREATED),
+	last_action_val(VALUE_NONE),
+	model_thread(false)
+{
+	int ret;
+
+	/* Initialize state */
+	ret = create_context();
+	if (ret)
+		model_print("Error in create_context\n");
+}
+
+
 /** Destructor */
 Thread::~Thread()
 {
-	complete();
-	model->remove_thread(this);
+	if (!is_complete())
+		complete();
 }
 
 /** @return The thread_id_t corresponding to this Thread object. */
-thread_id_t Thread::get_id()
+thread_id_t Thread::get_id() const
 {
 	return id;
 }
+
+/**
+ * Set a thread's THREAD_* state (@see thread_state)
+ * @param s The state to enter
+ */
+void Thread::set_state(thread_state s)
+{
+	ASSERT(s == THREAD_COMPLETED || state != THREAD_COMPLETED);
+	state = s;
+}
+
+/**
+ * Get the Thread that this Thread is immediately waiting on
+ * @return The thread we are waiting on, if any; otherwise NULL
+ */
+Thread * Thread::waiting_on() const
+{
+	if (!pending)
+		return NULL;
+
+	if (pending->get_type() == THREAD_JOIN)
+		return pending->get_thread_operand();
+	else if (pending->get_type() == PTHREAD_JOIN)
+		return pending->get_thread_operand();
+	else if (pending->is_lock())
+		return (Thread *)pending->get_mutex()->get_state()->locked;
+	return NULL;
+}
+
+/**
+ * Check if this Thread is waiting (blocking) on a given Thread, directly or
+ * indirectly (via a chain of waiting threads)
+ *
+ * @param t The Thread on which we may be waiting
+ * @return True if we are waiting on Thread t; false otherwise
+ */
+bool Thread::is_waiting_on(const Thread *t) const
+{
+	Thread *wait;
+	for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
+		if (wait == t)
+			return true;
+	return false;
+}