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 e6175e4..4fdc723 100644 (file)
--- a/examples/smpi/replay/replay.cpp
+++ b/examples/smpi/replay/replay.cpp
@@ -1,15 +1,20 @@
-/* Copyright (c) 2009-2018. 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. */
 
-#include <simgrid/plugins/load_balancer.h>
 #include "xbt/replay.hpp"
+#include "simgrid/s4u/Actor.hpp"
 #include "smpi/smpi.h"
+#include "xbt/asserts.h"
+#include "xbt/str.h"
+
+#include "xbt/log.h"
+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. */
@@ -18,25 +23,42 @@ static void action_blah(simgrid::xbt::ReplayAction& args)
 action_fun previous_send;
 static void overriding_send(simgrid::xbt::ReplayAction& args)
 {
-  previous_send(args); // Just call the overriden symbol. That's a toy example.
+  previous_send(args); // Just call the overridden symbol. That's a toy example.
 }
 
 int main(int argc, char* argv[])
 {
+  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) {
+    start_delay_flops = xbt_str_parse_double(argv[2], "Cannot parse start_delay_flops");
+  }
+
   /* Setup things and register default actions */
-  smpi_replay_init(&argc, &argv);
+  smpi_replay_init(instance_id, rank, start_delay_flops);
 
   /* 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 */
-  int rank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  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);
   }
   /* The regular run of the replayer */
-  smpi_replay_main(&argc, &argv);
+  if (shared_trace != nullptr)
+    xbt_replay_set_tracefile(shared_trace);
+  smpi_replay_main(rank, private_trace);
   return 0;
 }