Cleanup in log categories

[simgrid.git] / examples / cpp / replay-comm / s4u-replay-comm.cpp

diff --git a/examples/cpp/replay-comm/s4u-replay-comm.cpp b/examples/cpp/replay-comm/s4u-replay-comm.cpp
index 47432561c3b1207f548c88a123a0f639aa9dd3fc..c9a6172b7f65c7ba740fe871acf6b9c2d8e1593e 100644 (file)
--- a/examples/cpp/replay-comm/s4u-replay-comm.cpp
+++ b/examples/cpp/replay-comm/s4u-replay-comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2022. 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. */
@@ -10,7 +10,7 @@
 #include <cinttypes>
 #include <string>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this example");
 
 #define ACT_DEBUG(...)                                                                                                 \
   if (XBT_LOG_ISENABLED(replay_comm, xbt_log_priority_verbose)) {                                                   \
@@ -32,8 +32,12 @@ public:
   explicit Replayer(std::vector<std::string> args)
   {
     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);
+    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
@@ -92,23 +96,17 @@ int main(int argc, char* argv[])
   e.register_actor<Replayer>("p0");
   e.register_actor<Replayer>("p1");
   e.load_deployment(argv[2]);
+  if (argv[3] != nullptr)
+    xbt_replay_set_tracefile(argv[3]);
 
   /*   Action registration */
   xbt_replay_action_register("compute", Replayer::compute);
   xbt_replay_action_register("send", Replayer::send);
   xbt_replay_action_register("recv", Replayer::recv);
 
-  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", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }