Cleanup in log categories

[simgrid.git] / examples / smpi / replay / replay.cpp

diff --git a/examples/smpi/replay/replay.cpp b/examples/smpi/replay/replay.cpp
index 429a3a2..4fdc723 100644 (file)
--- a/examples/smpi/replay/replay.cpp
+++ b/examples/smpi/replay/replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2019. 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,11 +10,11 @@
 #include "xbt/str.h"
 
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(replay_test, "Messages specific for this example");
 
 /* This shows how to extend the trace format by adding a new kind of events.
    This function is registered through xbt_replay_action_register() below. */
-static void action_blah(simgrid::xbt::ReplayAction& /*args*/)
+static void action_blah(const simgrid::xbt::ReplayAction& /*args*/)
 {
   /* Add your answer to the blah event here.
      args is a strings array containing the blank-separated parameters found in the trace for this event instance. */
@@ -28,9 +28,13 @@ static void overriding_send(simgrid::xbt::ReplayAction& args)
 
 int main(int argc, char* argv[])
 {
-  const char* instance_id = simgrid::s4u::Actor::self()->get_property("instance_id");
-  const int rank          = xbt_str_parse_int(simgrid::s4u::Actor::self()->get_property("rank"), "Cannot parse rank");
-  const char* trace_filename = argv[1];
+  auto properties = simgrid::s4u::Actor::self()->get_properties();
+
+  const char* instance_id = properties->at("instance_id").c_str();
+  const int rank          = static_cast<int>(xbt_str_parse_int(properties->at("rank").c_str(), "Cannot parse rank"));
+  const char* shared_trace =
+      simgrid::s4u::Actor::self()->get_property("tracefile"); // Cannot use properties because this can be nullptr
+  const char* private_trace  = argv[1];
   double start_delay_flops   = 0;
 
   if (argc > 2) {
@@ -53,6 +57,8 @@ int main(int argc, char* argv[])
     xbt_replay_action_register("send", overriding_send);
   }
   /* The regular run of the replayer */
-  smpi_replay_main(rank, trace_filename);
+  if (shared_trace != nullptr)
+    xbt_replay_set_tracefile(shared_trace);
+  smpi_replay_main(rank, private_trace);
   return 0;
 }