poor damage control for tonight only

[simgrid.git] / src / s4u / s4u_Actor.cpp

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 1d719e0..34ae162 100644 (file)
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -39,15 +39,27 @@ ActorPtr Actor::self()
 
   return self_context->get_actor()->iface();
 }
-
-ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()> code)
+ActorPtr Actor::init(std::string name, s4u::Host* host)
 {
   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(); });
+  intrusive_ptr_release(actor);
+  return actor->ciface();
+}
 
+ActorPtr Actor::start(std::function<void()> code)
+{
+  simgrid::simix::simcall([this, code] { pimpl_->start(code); });
+  return this;
+}
+
+ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()> code)
+{
   simgrid::kernel::actor::ActorImpl* actor =
-      simgrid::simix::simcall([self, name, host, code] { return self->init(std::move(name), host)->start(code); });
+      simcall_process_create(std::move(name), std::move(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)