X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e51c90b78469c7c2067935ef62bf9474d09891d..616ba5a6c0390b7fd7b8dbd5849e4eb236c16c3c:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 40a9c30519..0e82ceeaf6 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -14,30 +14,17 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
-static int s4u_actor_runner(int argc, char **argv)
-{
-  // Move the callback from the heap to the stack:
-  std::unique_ptr<std::function<int()>> code2 =
-    std::unique_ptr<std::function<int()>>(
-      static_cast<std::function<int()>*>(
-        SIMIX_process_self_get_data()));
-  std::function<int()> code = std::move(*code2);
-  code2 = nullptr;
-  // Call it:
-  // TODO, handle exceptions
-  return code();
-}
-
 using namespace simgrid;
 
 s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
 
-s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<int()> code)
+s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
 {
-  std::function<int()>* code2 = new std::function<int()>(std::move(code));
+  // TODO, when autorestart is used, the std::function is copied so the new
+  // instance will get a fresh (reinitialized) state. Is this what we want?
   this->pimpl_ = simcall_process_create(
-    name, s4u_actor_runner, code2, host->name().c_str(),
-    killTime, 0, NULL, NULL, 0);
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, NULL, 0);
 }
 
 s4u::Actor::~Actor() {}