Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 40a9c30..a220c8c 100644 (file)
--- 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() {}
@@ -76,16 +63,21 @@ void s4u::Actor::killAll() {
   simcall_process_killall(1);
 }
 
-void s4u::Actor::sleep(double duration) {
+
+namespace simgrid {
+namespace s4u {
+namespace this_actor {
+
+void sleep(double duration) {
   simcall_process_sleep(duration);
 }
 
-e_smx_state_t s4u::Actor::execute(double flops) {
+e_smx_state_t execute(double flops) {
   smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
   return simcall_execution_wait(s);
 }
 
-void *s4u::Actor::recv(Mailbox &chan) {
+void* recv(Mailbox &chan) {
   void *res = NULL;
   Comm c = Comm::recv_init(chan);
   c.setDstData(&res,sizeof(res));
@@ -93,10 +85,14 @@ void *s4u::Actor::recv(Mailbox &chan) {
   return res;
 }
 
-void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) {
+void send(Mailbox &chan, void *payload, size_t simulatedSize) {
   Comm c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
   // c.start() is optional.
   c.wait();
 }
+
+}
+}
+}