#include "model.h"
#include "execution.h"
#include "schedule.h"
+#include "clockvector.h"
#ifdef TLS
#include <dlfcn.h>
return model->get_current_thread();
}
-void main_thread_startup() {
-#ifdef TLS
+/**
+ * @brief Get the current Thread id
+ *
+ * Must be called from a user context
+ *
+ * @return The id of the currently executing thread
+ */
+thread_id_t thread_current_id(void)
+{
+ ASSERT(model);
+ return model->get_current_thread_id();
+}
+
+void modelexit() {
+ model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+}
+
+void initMainThread() {
+ atexit(modelexit);
Thread * curr_thread = thread_current();
- /* 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));
-#endif
- thread_startup();
+ model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
}
/**
Thread * curr_thread = thread_current();
#ifndef TLS
/* 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));
+ model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
#endif
/* Call the actual thread function */
void *retval = curr_thread->pstart_routine(curr_thread->arg);
curr_thread->set_pthread_return(retval);
}
+#ifndef TLS
/* Finish thread properly */
- model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
+ model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
+#endif
}
static int (*pthread_mutex_init_p)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) = NULL;
}
if (!pthread_exit_p) {
- pthread_exit_p = (void (*)(void *))dlsym(RTLD_NEXT, "pthread_exit");
+ *((void (**)(void *)) &pthread_exit_p) = (void (*)(void *))dlsym(RTLD_NEXT, "pthread_exit");
if ((error = dlerror()) != NULL) {
fputs(error, stderr);
exit(EXIT_FAILURE);
int ret = getcontext(&curr_thread->helpercontext);
ASSERT(!ret);
+ //Setup destructor
+ if (pthread_setspecific(model->get_execution()->getPthreadKey(), (const void *)4)) {
+ printf("Destructor setup failed\n");
+ exit(-1);
+ }
+
+
/* Initialize new managed context */
- void *helperstack = stack_allocate(STACK_SIZE);
- curr_thread->helpercontext.uc_stack.ss_sp = helperstack;
+ curr_thread->helper_stack = stack_allocate(STACK_SIZE);
+ curr_thread->helpercontext.uc_stack.ss_sp = curr_thread->helper_stack;
curr_thread->helpercontext.uc_stack.ss_size = STACK_SIZE;
curr_thread->helpercontext.uc_stack.ss_flags = 0;
- curr_thread->helpercontext.uc_link = model->get_system_context();
+ curr_thread->helpercontext.uc_link = NULL;
makecontext(&curr_thread->helpercontext, finalize_helper_thread, 0);
model_swapcontext(&curr_thread->context, &curr_thread->helpercontext);
+
//start the real thread
thread_startup();
- //now the real thread has control again
- stack_free(helperstack);
-
return NULL;
}
+#ifdef TLS
+void tlsdestructor(void *v) {
+ uintptr_t count = (uintptr_t) v;
+ if (count > 1) {
+ if (pthread_setspecific(model->get_execution()->getPthreadKey(), (const void *)(count - 1))) {
+ printf("Destructor setup failed\n");
+ exit(-1);
+ }
+ return;
+ }
+ /* Finish thread properly */
+ model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+}
+#endif
+
void setup_context() {
Thread * curr_thread = thread_current();
/* 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));
+ model->switch_thread(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
real_init_all();
context.uc_stack.ss_sp = stack;
context.uc_stack.ss_size = STACK_SIZE;
context.uc_stack.ss_flags = 0;
- context.uc_link = model->get_system_context();
+ context.uc_link = NULL;
#ifdef TLS
- if (model != NULL)
- makecontext(&context, setup_context, 0);
- else
- makecontext(&context, main_thread_startup, 0);
+ makecontext(&context, setup_context, 0);
#else
makecontext(&context, thread_startup, 0);
#endif
return model_swapcontext(ctxt, &t->context);
}
+int Thread::swap(Thread *t, Thread *t2)
+{
+ t2->set_state(THREAD_RUNNING);
+ if (t == t2)
+ return 0;
-/** Terminate a thread and free its stack. */
+#ifdef TLS
+ if (t2->tls != NULL)
+ set_tls_addr((uintptr_t)t2->tls);
+#endif
+ return model_swapcontext(&t->context, &t2->context);
+}
+
+/** Terminate a thread. */
void Thread::complete()
{
ASSERT(!is_complete());
DEBUG("completed thread %d\n", id_to_int(get_id()));
state = THREAD_COMPLETED;
+}
+
+void Thread::freeResources() {
if (stack)
stack_free(stack);
#ifdef TLS
- if (this != model->getInitThread() && !model->getParams()->threadsnocleanup) {
- modellock = 1;
- ASSERT(thread_current()==NULL);
- Thread * curr_thread = model->getScheduler()->get_current_thread();
- //Make any current_thread calls work in code to free
- model->getScheduler()->set_current_thread(this);
+ if (this != model->getInitThread()) {
real_pthread_mutex_unlock(&mutex2);
real_pthread_join(thread, NULL);
- model->getScheduler()->set_current_thread(curr_thread);
- modellock = 0;
+ stack_free(helper_stack);
}
#endif
+ state = THREAD_FREED;
}
/**
*/
Thread::Thread(thread_id_t tid) :
parent(NULL),
+ acq_fence_cv(new ClockVector()),
creation(NULL),
pending(NULL),
+ wakeup_state(false),
start_routine(NULL),
arg(NULL),
stack(NULL),
*/
Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
parent(parent),
+ acq_fence_cv(new ClockVector()),
creation(NULL),
pending(NULL),
+ wakeup_state(false),
start_routine(func),
pstart_routine(NULL),
arg(a),
*/
Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent) :
parent(parent),
+ acq_fence_cv(new ClockVector()),
creation(NULL),
pending(NULL),
+ wakeup_state(false),
start_routine(NULL),
pstart_routine(func),
arg(a),
{
if (!is_complete())
complete();
+
+ delete acq_fence_cv;
}
/** @return The thread_id_t corresponding to this Thread object. */
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;
+ switch (pending->get_type()) {
+ case THREAD_JOIN:
+ case PTHREAD_JOIN:
+ return pending->get_thread_operand();
+ case ATOMIC_LOCK:
+ return (Thread *)pending->get_mutex()->get_state()->locked;
+ default:
+ return NULL;
+ }
}
/**
bool Thread::is_waiting_on(const Thread *t) const
{
Thread *wait;
+
+ // One thread relocks a recursive mutex
+ if (waiting_on() == t && pending->is_lock()) {
+ int mutex_type = pending->get_mutex()->get_state()->type;
+ if (mutex_type == PTHREAD_MUTEX_RECURSIVE)
+ return false;
+ }
+
for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
if (wait == t)
return true;
projects / c11tester.git / blobdiff