#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"
namespace context {
// UContextFactory
-Context* UContextFactory::create_context(std::function<void()> code, smx_actor_t actor)
+Context* UContextFactory::create_context(std::function<void()>&& code, smx_actor_t 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, smx_actor_t 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(), actor, &(this->uc_), smx_context_stack_size);
}
#endif
}