somehow smpif90 was not handling trace_call_location at all.

[simgrid.git] / src / smpi / smpi_replay_main.cpp

diff --git a/src/smpi/smpi_replay_main.cpp b/src/smpi/smpi_replay_main.cpp
index 2404541..d8cb726 100644 (file)
--- a/src/smpi/smpi_replay_main.cpp
+++ b/src/smpi/smpi_replay_main.cpp
@@ -1,26 +1,35 @@
+/* Copyright (c) 2018-2021. 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/s4u.hpp"
 #include "smpi/smpi.h"
 #include "xbt/asserts.h"
 #include "xbt/replay.hpp"
 #include "xbt/str.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_replay);
+
 int main(int argc, char* argv[])
 {
   if (simgrid::s4u::Actor::self() == nullptr) {
-    printf("smpireplaymain should not be called directly. Please use smpirun -replay instead.\n");
+    XBT_ERROR("smpireplaymain should not be called directly. Please use smpirun -replay instead.");
     return 1;
   }
 
   auto properties = simgrid::s4u::Actor::self()->get_properties();
   if (properties->find("smpi_replay") == properties->end()) {
-    printf("invalid smpireplaymain execution. Please use smpirun -replay instead.\n");
+    XBT_ERROR("invalid smpireplaymain execution. Please use smpirun -replay instead.");
     return 1;
   }
 
-  const char* instance_id    = properties->at("instance_id").c_str();
-  const int rank             = xbt_str_parse_int(properties->at("rank").c_str(), "Cannot parse rank");
-  const char* trace_filename = argv[1];
-  double start_delay_flops   = 0;
+  const char* instance_id = properties->at("instance_id").c_str();
+  const int rank          = 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");
@@ -35,6 +44,8 @@ int main(int argc, char* argv[])
   xbt_assert(new_rank == rank, "Rank inconsistency. Got %d, expected %d", new_rank, rank);
 
   /* The regular run of the replayer */
-  smpi_replay_main(rank, trace_filename);
+  if (shared_trace)
+    xbt_replay_set_tracefile(shared_trace);
+  smpi_replay_main(rank, private_trace);
   return 0;
 }