}
Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
- : code_(std::move(code)), actor_(actor)
+ : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
{
- /* If the user provided a function for the process then use it.
- Otherwise, it is the context for maestro and we should set it as the
- current context */
- if (has_code())
- this->cleanup_func_ = cleanup_func;
- else
+ /* If no function was provided, this is the context for maestro
+ * and we should set it as the current context */
+ if (not has_code())
set_current(this);
}
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
- /* The onCreation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
- simgrid::s4u::Actor::on_creation(tmp);
+ /* The on_creation() signal must be delayed until there, where the pid and everything is set */
+ simgrid::s4u::Actor::on_creation(process->iface());
return process;
}