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 a2d2ed166ba3350400e6e5c13cb9b897fdad628a..942d183fd2b23a025e702ea48bdf2cc29391b1f4 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-61,13
+61,13
@@
Thread * thread_current(void)
}
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()));
}
void initMainThread() {
atexit(modelexit);
Thread * curr_thread = thread_current();
}
void initMainThread() {
atexit(modelexit);
Thread * curr_thread = thread_current();
- 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));
}
/**
}
/**
@@
-80,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 */
@@
-93,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
}
@@
-212,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);
@@
-235,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
@@
-243,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();
@@
-285,7
+285,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_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
#ifdef TLS
makecontext(&context, setup_context, 0);
#else
@@
-331,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
@@
-496,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;