X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e33beb98eb2dd42717306a77a328c9d5e9a91f05..6ade1c748396ae71562fd718e8409de61ab00148:/examples/s4u/replay-comm/s4u-replay-comm.cpp

diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp
index 9eb3379c11..7c8f001cee 100644
--- a/examples/s4u/replay-comm/s4u-replay-comm.cpp
+++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2020. 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. */
@@ -7,6 +7,7 @@
 #include "xbt/replay.hpp"
 #include "xbt/str.h"
 #include <boost/algorithm/string/join.hpp>
+#include <cinttypes>
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg example");
@@ -18,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg exampl
   } else                                                                                                               \
   ((void)0)
 
-static void log_action(simgrid::xbt::ReplayAction& action, double date)
+static void log_action(const simgrid::xbt::ReplayAction& action, double date)
 {
   if (XBT_LOG_ISENABLED(replay_comm, xbt_log_priority_verbose)) {
     std::string s = boost::algorithm::join(action, " ");
@@ -30,12 +31,12 @@ class Replayer {
 public:
   explicit Replayer(std::vector<std::string> args)
   {
-    const char* actor_name     = args[0].c_str();
-    const char* trace_filename = args[1].c_str();
+    const char* actor_name     = args.at(0).c_str();
+    const char* trace_filename = args.size() > 1 ? args[1].c_str() : nullptr;
     simgrid::xbt::replay_runner(actor_name, trace_filename);
   }
 
-  void operator()()
+  void operator()() const
   {
     // Nothing to do here
   }
@@ -52,28 +53,25 @@ public:
 
   static void send(simgrid::xbt::ReplayAction& action)
   {
-    double size                 = std::stod(action[3]);
-    std::string* payload        = new std::string(action[3]);
-    double clock                = simgrid::s4u::Engine::get_clock();
-    simgrid::s4u::MailboxPtr to =
-        simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_name() + "_" + action[2]);
-    ACT_DEBUG("Entering Send: %s (size: %g) -- Actor %s on mailbox %s", NAME.c_str(), size,
+    auto size                 = static_cast<uint64_t>(std::stod(action[3]));
+    auto* payload             = new std::string(action[3]);
+    double clock              = simgrid::s4u::Engine::get_clock();
+    simgrid::s4u::Mailbox* to = simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_name() + "_" + action[2]);
+    ACT_DEBUG("Entering Send: %s (size: %" PRIu64 ") -- Actor %s on mailbox %s", NAME.c_str(), size,
               simgrid::s4u::this_actor::get_cname(), to->get_cname());
     to->put(payload, size);
-    delete payload;
-
     log_action(action, simgrid::s4u::Engine::get_clock() - clock);
   }
 
   static void recv(simgrid::xbt::ReplayAction& action)
   {
     double clock = simgrid::s4u::Engine::get_clock();
-    simgrid::s4u::MailboxPtr from =
+    simgrid::s4u::Mailbox* from =
         simgrid::s4u::Mailbox::by_name(std::string(action[2]) + "_" + simgrid::s4u::this_actor::get_name());
 
     ACT_DEBUG("Receiving: %s -- Actor %s on mailbox %s", NAME.c_str(), simgrid::s4u::this_actor::get_cname(),
               from->get_cname());
-    from->get();
+    from->get_unique<std::string>();
     log_action(action, simgrid::s4u::Engine::get_clock() - clock);
   }
 };
@@ -82,11 +80,12 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
 
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file [action_files]\n"
-                       "\t# if all actions are in the same file\n"
-                       "\tExample: %s msg_platform.xml msg_deployment.xml actions\n"
-                       "\t# if actions are in separate files, specified in deployment\n"
-                       "\tExample: %s msg_platform.xml msg_deployment.xml ",
+  xbt_assert(argc > 2,
+             "Usage: %s platform_file deployment_file [action_files]\n"
+             "\t# if all actions are in the same file\n"
+             "\tExample: %s platform.xml deployment.xml actions\n"
+             "\t# if actions are in separate files, specified in deployment\n"
+             "\tExample: %s platform.xml deployment.xml ",
              argv[0], argv[0], argv[0]);
 
   e.load_platform(argv[1]);
@@ -99,16 +98,15 @@ int main(int argc, char* argv[])
   xbt_replay_action_register("send", Replayer::send);
   xbt_replay_action_register("recv", Replayer::recv);
 
+  std::ifstream ifs;
   if (argv[3]) {
-    simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
+    ifs.open(argv[3], std::ifstream::in);
+    simgrid::xbt::action_fs = &ifs;
   }
 
   e.run();
 
-  if (argv[3]) {
-    delete simgrid::xbt::action_fs;
-    simgrid::xbt::action_fs = nullptr;
-  }
+  simgrid::xbt::action_fs = nullptr;
 
   XBT_INFO("Simulation time %g", e.get_clock());