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;
}
// 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;
}
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()