} catch (simgrid::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());
+ XBT_INFO("Actor killed by an uncaught exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
throw;
}
ASAN_ONLY(context->asan_stop_ = true);
namespace context {
// UContextFactory
-Context* UContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor)
+UContext* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
{
return new_context<UContext>(std::move(code), actor, this);
}
// UContext
-UContext::UContext(std::function<void()>&& code, smx_actor_t actor, SwappedContextFactory* factory)
+UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory)
: SwappedContext(std::move(code), actor, factory)
{
/* if the user provided a function for the actor then use it. If not, nothing to do for maestro. */
getcontext(&this->uc_);
this->uc_.uc_link = nullptr;
this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(get_stack());
- this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
+ this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_stack_size);
// Makecontext expects integer arguments; we want to pass a pointer.
// This context address is decomposed into a serie of integers, which are passed as arguments to makecontext.
#if SIMGRID_HAVE_MC
if (MC_is_active()) {
- MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_usable_stack_size);
+ MC_register_stack_area(get_stack(), &(this->uc_), smx_context_stack_size);
}
#endif
}
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
-}}} // namespace simgrid::kernel::context
+} // namespace context
+} // namespace kernel
+} // namespace simgrid