X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a64ca4c11a1eb7ba2ecd102f877ac571486a034..9f2dfd25486ba89c4adaa54d774092c0b9756361:/examples/cpp/replay-io/s4u-replay-io.cpp

diff --git a/examples/cpp/replay-io/s4u-replay-io.cpp b/examples/cpp/replay-io/s4u-replay-io.cpp
index 66ebcffdc5..c09f2ac7a1 100644
--- a/examples/cpp/replay-io/s4u-replay-io.cpp
+++ b/examples/cpp/replay-io/s4u-replay-io.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2023. 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. */
@@ -11,6 +11,7 @@
 #include <boost/algorithm/string/join.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(replay_io, "Messages specific for this example");
+namespace sg4 = simgrid::s4u;
 
 #define ACT_DEBUG(...)                                                                                                 \
   if (XBT_LOG_ISENABLED(replay_io, xbt_log_priority_verbose)) {                                                        \
@@ -20,7 +21,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(replay_io, "Messages specific for this example");
     ((void)0)
 
 class Replayer {
-  static std::unordered_map<std::string, simgrid::s4u::File> opened_files;
+  static std::unordered_map<std::string, sg4::File*> opened_files;
 
   static void log_action(const simgrid::xbt::ReplayAction& action, double date)
   {
@@ -30,17 +31,22 @@ class Replayer {
     }
   }
 
-  static simgrid::s4u::File* get_file_descriptor(const std::string& file_name)
+  static sg4::File* get_file_descriptor(const std::string& file_name)
   {
-    std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name;
-    return &opened_files.at(full_name);
+    std::string full_name = sg4::this_actor::get_name() + ":" + file_name;
+    return opened_files.at(full_name);
   }
 
 public:
   explicit Replayer(std::vector<std::string> args)
   {
     const char* actor_name = args[0].c_str();
-    simgrid::xbt::replay_runner(actor_name, nullptr);
+    if (args.size() > 1) { // split mode, the trace file was provided in the deployment file
+      const char* trace_filename = args[1].c_str();
+      simgrid::xbt::replay_runner(actor_name, trace_filename);
+    } else { // Merged mode
+      simgrid::xbt::replay_runner(actor_name);
+    }
   }
 
   void operator()() const
@@ -52,49 +58,50 @@ public:
   static void open(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
-    double clock          = simgrid::s4u::Engine::get_clock();
-    std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name;
+    double clock          = sg4::Engine::get_clock();
+    std::string full_name = sg4::this_actor::get_name() + ":" + file_name;
 
     ACT_DEBUG("Entering Open: %s (filename: %s)", NAME.c_str(), file_name.c_str());
-    opened_files.emplace(std::piecewise_construct, std::forward_as_tuple(full_name),
-                         std::forward_as_tuple(file_name, nullptr));
+    auto* file = sg4::File::open(file_name, nullptr);
+    opened_files.try_emplace(full_name, file);
 
-    log_action(action, simgrid::s4u::Engine::get_clock() - clock);
+    log_action(action, sg4::Engine::get_clock() - clock);
   }
 
   static void read(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
     sg_size_t size        = std::stoul(action[3]);
-    double clock          = simgrid::s4u::Engine::get_clock();
+    double clock          = sg4::Engine::get_clock();
 
-    simgrid::s4u::File* file = get_file_descriptor(file_name);
+    sg4::File* file = get_file_descriptor(file_name);
 
     ACT_DEBUG("Entering Read: %s (size: %llu)", NAME.c_str(), size);
     file->read(size);
 
-    log_action(action, simgrid::s4u::Engine::get_clock() - clock);
+    log_action(action, sg4::Engine::get_clock() - clock);
   }
 
   static void close(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
-    std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name;
-    double clock          = simgrid::s4u::Engine::get_clock();
+    std::string full_name = sg4::this_actor::get_name() + ":" + file_name;
+    double clock          = sg4::Engine::get_clock();
 
     ACT_DEBUG("Entering Close: %s (filename: %s)", NAME.c_str(), file_name.c_str());
-    XBT_ATTRIB_UNUSED auto count = opened_files.erase(full_name);
-    xbt_assert(count == 1, "File not found in opened files: %s", full_name.c_str());
-
-    log_action(action, simgrid::s4u::Engine::get_clock() - clock);
+    auto entry = opened_files.find(full_name);
+    xbt_assert(entry != opened_files.end(), "File not found in opened files: %s", full_name.c_str());
+    entry->second->close();
+    opened_files.erase(entry);
+    log_action(action, sg4::Engine::get_clock() - clock);
   }
 };
 
-std::unordered_map<std::string, simgrid::s4u::File> Replayer::opened_files;
+std::unordered_map<std::string, sg4::File*> Replayer::opened_files;
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   sg_storage_file_system_init();
 
   xbt_assert(argc > 3,
@@ -108,22 +115,17 @@ int main(int argc, char* argv[])
   e.register_actor<Replayer>("p0");
   e.load_deployment(argv[2]);
 
+  if (argv[3] != nullptr)
+    xbt_replay_set_tracefile(argv[3]);
+
   /*   Action registration */
   xbt_replay_action_register("open", Replayer::open);
   xbt_replay_action_register("read", Replayer::read);
   xbt_replay_action_register("close", Replayer::close);
 
-  std::ifstream ifs;
-  if (argv[3]) {
-    ifs.open(argv[3], std::ifstream::in);
-    simgrid::xbt::action_fs = &ifs;
-  }
-
   e.run();
 
-  simgrid::xbt::action_fs = nullptr;
-
-  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }