// ThreadContextFactory
-ThreadContextFactory::ThreadContextFactory()
- : ContextFactory("ThreadContextFactory"), parallel_(SIMIX_context_is_parallel())
+ThreadContextFactory::ThreadContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel())
{
if (parallel_)
ParallelThreadContext::initialize();
ThreadContext::~ThreadContext()
{
- if (this->thread_) /* If there is a thread (maestro don't have any), wait for its termination */
+ if (this->thread_) { /* Maestro don't have any thread */
thread_->join();
- delete thread_;
+ delete thread_;
+ }
}
void *ThreadContext::wrapper(void *param)
try {
(*context)();
+ if (not context->is_maestro()) { // Just in case somebody detached maestro
+ context->Context::stop();
+ context->stop_hook();
+ }
} catch (StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest");
+ XBT_DEBUG("Caught a StopRequest in Thread::wrapper");
xbt_assert(not context->is_maestro(), "Maestro shall not receive StopRequests, even when detached.");
} catch (simgrid::Exception const& e) {
XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
throw;
}
- if (not context->is_maestro()) // Just in case somebody detached maestro
- context->Context::stop();
-
// Signal to the caller (normally the maestro) that we have finished:
context->yield();
stack.ss_flags = SS_DISABLE;
sigaltstack(&stack, nullptr);
#endif
+ XBT_DEBUG("Terminating");
+ Context::set_current(nullptr);
return nullptr;
}
void ThreadContext::stop()
{
Context::stop();
+ stop_hook();
throw StopRequest();
}