Kill a few globals.

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

diff --git a/examples/smpi/replay/replay.cpp b/examples/smpi/replay/replay.cpp
index 9cb0c63..d6fff83 100644 (file)
--- a/examples/smpi/replay/replay.cpp
+++ b/examples/smpi/replay/replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
@@ -10,7 +10,7 @@
 #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. */
@@ -20,18 +20,15 @@ static void action_blah(const simgrid::xbt::ReplayAction& /*args*/)
      args is a strings array containing the blank-separated parameters found in the trace for this event instance. */
 }
 
-action_fun previous_send;
-static void overriding_send(simgrid::xbt::ReplayAction& args)
-{
-  previous_send(args); // Just call the overridden symbol. That's a toy example.
-}
-
 int main(int argc, char* argv[])
 {
-  const char* instance_id = simgrid::s4u::Actor::self()->get_property("instance_id");
-  const int rank =
-      static_cast<int>(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) {
@@ -44,16 +41,21 @@ int main(int argc, char* argv[])
   /* Connect your callback function to the "blah" event in the trace files */
   xbt_replay_action_register("blah", action_blah);
 
-  /* The send action is an override, so we have to first save its previous value in a global */
+  /* The send action is an override, so we could have saved its previous value in a global, or use a lambda capture like
+   * in the following */
   int new_rank;
   MPI_Comm_rank(MPI_COMM_WORLD, &new_rank);
   if (new_rank != rank)
     XBT_WARN("Rank inconsistency. Got %d, expected %d", new_rank, rank);
   if (rank == 0) {
-    previous_send = xbt_replay_action_get("send");
-    xbt_replay_action_register("send", overriding_send);
+    auto previous_send = xbt_replay_action_get("send");
+    xbt_replay_action_register("send", [previous_send](simgrid::xbt::ReplayAction& args) {
+      previous_send(args); // Just call the overridden symbol. That's a toy example.
+    });
   }
   /* 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;
 }