X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0de276c508e72812e3d208a6f631cdd277b5c12c..53782855f0f3041e92f763891722e8a253479451:/examples/s4u/actions-comm/s4u_actions-comm.cpp

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.cpp b/examples/s4u/actions-comm/s4u_actions-comm.cpp
index eff4f23b81..bb7db5d830 100644
--- a/examples/s4u/actions-comm/s4u_actions-comm.cpp
+++ b/examples/s4u/actions-comm/s4u_actions-comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -31,59 +31,60 @@ public:
   {
     int argc;
     char* argv[2];
-    argv[0] = (char*)(args.at(0).c_str());
+    argv[0] = &args.at(0)[0];
     if (args.size() == 1) {
       argc = 1;
     } else {
       argc    = 2;
-      argv[1] = (char*)(args.at(1).c_str());
+      argv[1] = &args.at(1)[0];
     }
-    xbt_replay_action_runner(argc, argv);
+    simgrid::xbt::replay_runner(argc, argv);
   }
 
-  void operator()() {}
+  void operator()()
+  {
+    // Nothing to do here
+  }
 
   /* My actions */
   static void compute(const char* const* action)
   {
     double amount = std::stod(action[2]);
-    double clock  = simgrid::s4u::Engine::instance()->getClock();
+    double clock  = simgrid::s4u::Engine::getClock();
     ACT_DEBUG("Entering %s", NAME);
     simgrid::s4u::this_actor::execute(amount);
-    log_action(action, simgrid::s4u::Engine::instance()->getClock() - clock);
+    log_action(action, simgrid::s4u::Engine::getClock() - clock);
   }
 
   static void send(const char* const* action)
   {
     double size                 = std::stod(action[3]);
     char* payload               = xbt_strdup(action[3]);
-    double clock                = simgrid::s4u::Engine::instance()->getClock();
+    double clock                = simgrid::s4u::Engine::getClock();
     simgrid::s4u::MailboxPtr to = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::name() + "_" + action[2]);
     ACT_DEBUG("Entering Send: %s (size: %g) -- Actor %s on mailbox %s", NAME, size,
               simgrid::s4u::this_actor::name().c_str(), to->name());
-    simgrid::s4u::this_actor::send(to, payload, size);
+    to->send(payload, size);
     xbt_free(payload);
 
-    log_action(action, simgrid::s4u::Engine::instance()->getClock() - clock);
+    log_action(action, simgrid::s4u::Engine::getClock() - clock);
   }
 
   static void recv(const char* const* action)
   {
-    double clock = simgrid::s4u::Engine::instance()->getClock();
+    double clock = simgrid::s4u::Engine::getClock();
     simgrid::s4u::MailboxPtr from =
         simgrid::s4u::Mailbox::byName(std::string(action[2]) + "_" + simgrid::s4u::this_actor::name());
 
     ACT_DEBUG("Receiving: %s -- Actor %s on mailbox %s", NAME, simgrid::s4u::this_actor::name().c_str(), from->name());
-    simgrid::s4u::this_actor::recv(from);
-    log_action(action, simgrid::s4u::Engine::instance()->getClock() - clock);
+    from->recv();
+    log_action(action, simgrid::s4u::Engine::getClock() - clock);
   }
 };
 
 int main(int argc, char *argv[])
 {
   simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
-  /* Explicit initialization of the action module is required now*/
-  _xbt_replay_action_init();
 
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file [action_files]\n"
                        "\t# if all actions are in the same file\n"
@@ -93,7 +94,7 @@ int main(int argc, char *argv[])
              argv[0], argv[0], argv[0]);
 
   e->loadPlatform(argv[1]);
-  e->registerDefault(xbt_replay_action_runner);
+  e->registerDefault(&simgrid::xbt::replay_runner);
   e->registerFunction<Replayer>("p0");
   e->registerFunction<Replayer>("p1");
   e->loadDeployment(argv[2]);
@@ -103,7 +104,6 @@ int main(int argc, char *argv[])
   xbt_replay_action_register("send", Replayer::send);
   xbt_replay_action_register("recv", Replayer::recv);
 
-  /* Actually do the simulation using MSG_action_trace_run */
   if (argv[3]) {
     simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
   }
@@ -117,7 +117,6 @@ int main(int argc, char *argv[])
 
   XBT_INFO("Simulation time %g", e->getClock());
 
-  _xbt_replay_action_exit(); /* Explicit finalization of the action module */
-
+  delete e;
   return 0;
 }