projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix
[c11tester.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index 8ee3bf975e732d7c943e512005c2dfd9eb218118..942d183fd2b23a025e702ea48bdf2cc29391b1f4 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-14,6
+14,7
@@
#include "model.h"
#include "execution.h"
#include "schedule.h"
#include "model.h"
#include "execution.h"
#include "schedule.h"
+#include "clockvector.h"
#ifdef TLS
#include <dlfcn.h>
#ifdef TLS
#include <dlfcn.h>
@@
-59,21
+60,14
@@
Thread * thread_current(void)
return model->get_current_thread();
}
return model->get_current_thread();
}
-#ifdef TLS
void modelexit() {
void modelexit() {
- model->switch_t
o_master
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+ model->switch_t
hread
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
}
}
-#endif
-void main_thread_startup() {
-#ifdef TLS
+void initMainThread() {
atexit(modelexit);
Thread * curr_thread = thread_current();
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));
}
/**
}
/**
@@
-86,7
+80,7
@@
void thread_startup()
Thread * curr_thread = thread_current();
#ifndef TLS
/* Add dummy "start" action, just to create a first clock vector */
Thread * curr_thread = thread_current();
#ifndef TLS
/* Add dummy "start" action, just to create a first clock vector */
- model->switch_t
o_master
(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
+ model->switch_t
hread
(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
#endif
/* Call the actual thread function */
#endif
/* Call the actual thread function */
@@
-99,7
+93,7
@@
void thread_startup()
}
#ifndef TLS
/* Finish thread properly */
}
#ifndef TLS
/* Finish thread properly */
- model->switch_t
o_master
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
+ model->switch_t
hread
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
#endif
}
#endif
}
@@
-218,7
+212,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_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);
makecontext(&curr_thread->helpercontext, finalize_helper_thread, 0);
model_swapcontext(&curr_thread->context, &curr_thread->helpercontext);
@@
-241,7
+235,7
@@
void tlsdestructor(void *v) {
return;
}
/* Finish thread properly */
return;
}
/* Finish thread properly */
- model->switch_t
o_master
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
+ model->switch_t
hread
(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
}
#endif
}
#endif
@@
-249,7
+243,7
@@
void setup_context() {
Thread * curr_thread = thread_current();
/* Add dummy "start" action, just to create a first clock vector */
Thread * curr_thread = thread_current();
/* Add dummy "start" action, just to create a first clock vector */
- model->switch_t
o_master
(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
+ model->switch_t
hread
(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
real_init_all();
real_init_all();
@@
-291,12
+285,9
@@
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_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
#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
#else
makecontext(&context, thread_startup, 0);
#endif
@@
-340,13
+331,28
@@
int Thread::swap(ucontext_t *ctxt, Thread *t)
return model_swapcontext(ctxt, &t->context);
}
return model_swapcontext(ctxt, &t->context);
}
+int Thread::swap(Thread *t, Thread *t2)
+{
+ t2->set_state(THREAD_RUNNING);
+ if (t == t2)
+ return 0;
+
+#ifdef TLS
+ if (t2->tls != NULL)
+ set_tls_addr((uintptr_t)t2->tls);
+#endif
+ return model_swapcontext(&t->context, &t2->context);
+}
-/** Terminate a thread
and free its stack
. */
+/** Terminate a thread. */
void Thread::complete()
{
ASSERT(!is_complete());
DEBUG("completed thread %d\n", id_to_int(get_id()));
state = THREAD_COMPLETED;
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 (stack)
stack_free(stack);
#ifdef TLS
@@
-369,6
+375,7
@@
void Thread::complete()
*/
Thread::Thread(thread_id_t tid) :
parent(NULL),
*/
Thread::Thread(thread_id_t tid) :
parent(NULL),
+ acq_fence_cv(new ClockVector()),
creation(NULL),
pending(NULL),
start_routine(NULL),
creation(NULL),
pending(NULL),
start_routine(NULL),
@@
-394,6
+401,7
@@
Thread::Thread(thread_id_t tid) :
*/
Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
parent(parent),
*/
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),
start_routine(func),
creation(NULL),
pending(NULL),
start_routine(func),
@@
-426,6
+434,7
@@
Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread
*/
Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent) :
parent(parent),
*/
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),
start_routine(NULL),
creation(NULL),
pending(NULL),
start_routine(NULL),
@@
-454,6
+463,8
@@
Thread::~Thread()
{
if (!is_complete())
complete();
{
if (!is_complete())
complete();
+
+ delete acq_fence_cv;
}
/** @return The thread_id_t corresponding to this Thread object. */
}
/** @return The thread_id_t corresponding to this Thread object. */
@@
-500,6
+511,14
@@
Thread * Thread::waiting_on() const
bool Thread::is_waiting_on(const Thread *t) const
{
Thread *wait;
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;
for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
if (wait == t)
return true;