namespace context {
// BoostContextFactory
-smx_context_t BoostContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
- smx_actor_t process)
+BoostContext* BoostContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
{
- return this->new_context<BoostContext>(std::move(code), cleanup_func, process, this);
+ return this->new_context<BoostContext>(std::move(code), actor, this);
}
// BoostContext
-BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor,
- SwappedContextFactory* factory)
- : SwappedContext(std::move(code), cleanup_func, actor, factory)
+BoostContext::BoostContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory)
+ : SwappedContext(std::move(code), actor, factory)
{
/* if the user provided a function for the process then use it, otherwise it is the context for maestro */
/* We need to pass the bottom of the stack to make_fcontext,
depending on the stack direction it may be the lower or higher address: */
#if PTH_STACKGROWTH == -1
- void* stack = static_cast<char*>(get_stack()) + smx_context_usable_stack_size;
+ unsigned char* stack = get_stack() + smx_context_stack_size;
#else
- void* stack = get_stack();
+ unsigned char* stack = get_stack();
#endif
#if BOOST_VERSION < 106100
- this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
+ this->fc_ = boost::context::make_fcontext(stack, smx_context_stack_size, BoostContext::wrapper);
#else
- this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
+ this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_stack_size, BoostContext::wrapper);
#endif
} else {
#endif
try {
(*context)();
- } catch (StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest");
+ context->Context::stop();
+ } catch (ForcefulKillException const&) {
+ XBT_DEBUG("Caught a ForcefulKillException");
} catch (simgrid::Exception const& e) {
XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
throw;
}
- context->Context::stop();
ASAN_ONLY(context->asan_stop_ = true);
context->suspend();
}
XBT_VERB("Using Boost contexts. Welcome to the 21th century.");
return new BoostContextFactory();
}
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid