A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
More cleanup in contexts' stop().
[simgrid.git]
/
src
/
kernel
/
context
/
ContextThread.cpp
diff --git
a/src/kernel/context/ContextThread.cpp
b/src/kernel/context/ContextThread.cpp
index
4ed2f29
..
8e9ee72
100644
(file)
--- a/
src/kernel/context/ContextThread.cpp
+++ b/
src/kernel/context/ContextThread.cpp
@@
-58,7
+58,7
@@
void ThreadContextFactory::run_all()
{
if (smx_ctx_thread_sem == nullptr) {
// Serial execution
- for (smx_actor_t process : simix_global->process_to_run) {
+ for (smx_actor_t
const&
process : simix_global->process_to_run) {
XBT_DEBUG("Handling %p",process);
ThreadContext* context = static_cast<ThreadContext*>(process->context);
xbt_os_sem_release(context->begin_);
@@
-66,9
+66,9
@@
void ThreadContextFactory::run_all()
}
} else {
// Parallel execution
- for (smx_actor_t process : simix_global->process_to_run)
+ for (smx_actor_t
const&
process : simix_global->process_to_run)
xbt_os_sem_release(static_cast<ThreadContext*>(process->context)->begin_);
- for (smx_actor_t process : simix_global->process_to_run)
+ for (smx_actor_t
const&
process : simix_global->process_to_run)
xbt_os_sem_acquire(static_cast<ThreadContext*>(process->context)->end_);
}
}
@@
-151,9
+151,22
@@
void *ThreadContext::wrapper(void *param)
if (smx_ctx_thread_sem) /* parallel run */
xbt_os_sem_acquire(smx_ctx_thread_sem);
- (*context)();
- context->stop();
+ try {
+ (*context)();
+ context->Context::stop();
+ } catch (StopRequest const&) {
+ XBT_DEBUG("Caught a StopRequest");
+ }
+
+ if (smx_ctx_thread_sem)
+ xbt_os_sem_release(smx_ctx_thread_sem);
+ // Signal to the maestro that it has finished:
+ xbt_os_sem_release(context->end_);
+#ifndef WIN32
+ stack.ss_flags = SS_DISABLE;
+ sigaltstack(&stack, nullptr);
+#endif
return nullptr;
}
@@
-179,6
+192,10
@@
void *ThreadContext::maestro_wrapper(void *param)
// Tell main that we have finished:
xbt_os_sem_release(context->end_);
+#ifndef WIN32
+ stack.ss_flags = SS_DISABLE;
+ sigaltstack(&stack, nullptr);
+#endif
return nullptr;
}
@@
-192,13
+209,7
@@
void ThreadContext::start()
void ThreadContext::stop()
{
Context::stop();
- if (smx_ctx_thread_sem)
- xbt_os_sem_release(smx_ctx_thread_sem);
-
- // Signal to the maestro that it has finished:
- xbt_os_sem_release(this->end_);
-
- xbt_os_thread_exit(nullptr);
+ throw StopRequest();
}
void ThreadContext::suspend()