ParallelThreadContext::finalize();
}
-ThreadContext* ThreadContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup,
- smx_actor_t actor, bool maestro)
+ThreadContext* ThreadContextFactory::create_context(std::function<void()> code, smx_actor_t actor, bool maestro)
{
if (parallel_)
- return this->new_context<ParallelThreadContext>(std::move(code), cleanup, actor, maestro);
+ return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
else
- return this->new_context<SerialThreadContext>(std::move(code), cleanup, actor, maestro);
+ return this->new_context<SerialThreadContext>(std::move(code), actor, maestro);
}
void ThreadContextFactory::run_all()
// ThreadContext
-ThreadContext::ThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t actor, bool maestro)
- : AttachContext(std::move(code), cleanup, actor), is_maestro_(maestro)
+ThreadContext::ThreadContext(std::function<void()> code, smx_actor_t actor, bool maestro)
+ : AttachContext(std::move(code), actor), is_maestro_(maestro)
{
/* If the user provided a function for the actor then use it */
if (has_code()) {
}
}
-void *ThreadContext::wrapper(void *param)
+void ThreadContext::wrapper(ThreadContext* context)
{
- ThreadContext* context = static_cast<ThreadContext*>(param);
Context::set_current(context);
#ifndef WIN32
context->Context::stop();
context->stop_hook();
}
- } catch (StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest in Thread::wrapper");
- xbt_assert(not context->is_maestro(), "Maestro shall not receive StopRequests, even when detached.");
+ } catch (ForcefulKillException const&) {
+ XBT_DEBUG("Caught a ForcefulKillException in Thread::wrapper");
+ xbt_assert(not context->is_maestro(), "Maestro shall not receive ForcefulKillExceptions, 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;
#endif
XBT_DEBUG("Terminating");
Context::set_current(nullptr);
- return nullptr;
}
void ThreadContext::release()
{
Context::stop();
stop_hook();
- throw StopRequest();
+ throw ForcefulKillException();
}
void ThreadContext::suspend()