}
ActorPtr Actor::init(std::string name, s4u::Host* host)
{
- return SIMIX_process_self()->init(std::move(name), host)->iface();
+ smx_actor_t self = SIMIX_process_self();
+ simgrid::kernel::actor::ActorImpl* actor =
+ simgrid::simix::simcall([self, name, host] { return self->init(std::move(name), host).get(); });
+ return actor->ciface();
}
-ActorPtr Actor::start(std::function<void()> code)
+ActorPtr Actor::start(const std::function<void()>& code)
{
- simgrid::simix::simcall([this, code] { return this->get_impl()->start(code); });
+ simgrid::simix::simcall([this, &code] { pimpl_->start(code); });
return this;
}
-ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()> code)
+ActorPtr Actor::create(std::string name, s4u::Host* host, const std::function<void()>& code)
{
- smx_actor_t self = SIMIX_process_self();
-
- simgrid::kernel::actor::ActorImpl* actor =
- simgrid::simix::simcall([self, name, host, code] { return self->init(std::move(name), host)->start(code); });
+ simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(std::move(name), code, nullptr, host, nullptr);
- return actor->ciface();
+ return actor->iface();
}
ActorPtr Actor::create(std::string name, s4u::Host* host, const std::string& function, std::vector<std::string> args)
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
-void Actor::on_exit(std::function<void(bool /*failed*/)> const fun)
+void Actor::on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
+{
+ on_exit([fun, data](bool exit) { fun(exit, data); });
+}
+
+void Actor::on_exit(const std::function<void(bool /*failed*/)>& fun)
{
simgrid::simix::simcall(
[this, fun] { SIMIX_process_on_exit(pimpl_, [fun](int a, void* /*data*/) { fun(a != 0); }, nullptr); });
simgrid::simix::simcall([actor] { actor->exit(); });
}
-void on_exit(std::function<void(bool)> const fun)
+void on_exit(const std::function<void(bool)>& fun)
{
SIMIX_process_self()->iface()->on_exit(fun);
}
-void on_exit(std::function<void(int, void*)> const fun, void* data) /* deprecated */
+void on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
{
SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); });
}