X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=bd1b624959629d3613e76afda0b72a58e795d122;hb=HEAD;hp=a576697f561087fe2c09c607e44ef02bb0c6fa8c;hpb=ac024d1df83ffe1c97833c9da7bc43ca91a8f12f;p=c11tester.git diff --git a/threads.cc b/threads.cc index a576697f..bd1b6249 100644 --- a/threads.cc +++ b/threads.cc @@ -16,8 +16,9 @@ #include "schedule.h" #include "clockvector.h" -#ifdef TLS #include + +#ifdef TLS uintptr_t get_tls_addr() { uintptr_t addr; asm ("mov %%fs:0, %0" : "=r" (addr)); @@ -60,14 +61,27 @@ Thread * thread_current(void) return model->get_current_thread(); } +/** + * @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_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current())); + model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current())); } void initMainThread() { atexit(modelexit); Thread * curr_thread = thread_current(); - 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)); } /** @@ -80,7 +94,7 @@ void thread_startup() 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 */ @@ -93,10 +107,17 @@ void thread_startup() } #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 (*real_epoll_wait_p)(int epfd, struct epoll_event *events, int maxevents, int timeout) = NULL; + +int real_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) { + return real_epoll_wait_p(epfd, events, maxevents, timeout); +} + static int (*pthread_mutex_init_p)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) = NULL; int real_pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) { @@ -135,6 +156,13 @@ void real_pthread_exit (void * value_ptr) { void real_init_all() { char * error; + if (!real_epoll_wait_p) { + real_epoll_wait_p = (int (*)(int epfd, struct epoll_event *events, int maxevents, int timeout))dlsym(RTLD_NEXT, "epoll_wait"); + if ((error = dlerror()) != NULL) { + fputs(error, stderr); + exit(EXIT_FAILURE); + } + } if (!pthread_mutex_init_p) { pthread_mutex_init_p = (int (*)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr))dlsym(RTLD_NEXT, "pthread_mutex_init"); if ((error = dlerror()) != NULL) { @@ -212,7 +240,7 @@ void * helper_thread(void * ptr) { 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); @@ -235,7 +263,7 @@ void tlsdestructor(void *v) { return; } /* Finish thread properly */ - model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current())); + model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current())); } #endif @@ -243,7 +271,7 @@ 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(); @@ -285,7 +313,7 @@ int Thread::create_context() 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 makecontext(&context, setup_context, 0); #else @@ -331,23 +359,38 @@ int Thread::swap(ucontext_t *ctxt, Thread *t) 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()) { - ASSERT(thread_current()==NULL); real_pthread_mutex_unlock(&mutex2); real_pthread_join(thread, NULL); stack_free(helper_stack); } #endif + state = THREAD_FREED; } /** @@ -363,6 +406,7 @@ Thread::Thread(thread_id_t tid) : acq_fence_cv(new ClockVector()), creation(NULL), pending(NULL), + wakeup_state(false), start_routine(NULL), arg(NULL), stack(NULL), @@ -375,6 +419,8 @@ Thread::Thread(thread_id_t tid) : last_action_val(0), model_thread(true) { + // real_memset is not defined when + // the model thread is constructed memset(&context, 0, sizeof(context)); } @@ -389,6 +435,7 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread acq_fence_cv(new ClockVector()), creation(NULL), pending(NULL), + wakeup_state(false), start_routine(func), pstart_routine(NULL), arg(a), @@ -422,6 +469,7 @@ Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Threa acq_fence_cv(new ClockVector()), creation(NULL), pending(NULL), + wakeup_state(false), start_routine(NULL), pstart_routine(func), arg(a), @@ -477,13 +525,15 @@ 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; + 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; + } } /**