#include "mc/mc.h"
#include "simgrid/Exception.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/mc/mc_ignore.hpp"
-#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.hpp"
#include "ContextUnix.hpp"
try {
(*context)();
context->Context::stop();
- } catch (simgrid::kernel::context::StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest");
+ } 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.
+ // This context address is decomposed into a series of integers, which are passed as arguments to makecontext.
int ctx_addr[CTX_ADDR_LEN]{};
UContext* arg = this;
#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
}
void UContext::swap_into(SwappedContext* to_)
{
- UContext* to = static_cast<UContext*>(to_);
+ const UContext* to = static_cast<UContext*>(to_);
ASAN_ONLY(void* fake_stack = nullptr);
- ASAN_ONLY(to->asan_ctx_ = this);
- ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
+ ASAN_ONLY(to_->asan_ctx_ = this);
+ ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to_->asan_stack_, to_->asan_stack_size_);
swapcontext(&this->uc_, &to->uc_);
ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_);
}
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
-}}} // namespace simgrid::kernel::context
+} // namespace context
+} // namespace kernel
+} // namespace simgrid