Merge branch 'udpor-phase6' into 'master'

[simgrid.git] / src / mc / mc_replay.hpp

diff --git a/src/mc/mc_replay.hpp b/src/mc/mc_replay.hpp
index ad36981..7c0ae43 100644 (file)
--- a/src/mc/mc_replay.hpp
+++ b/src/mc/mc_replay.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-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. */
@@ -6,18 +6,26 @@
 #ifndef SIMGRID_MC_REPLAY_H
 #define SIMGRID_MC_REPLAY_H
 
-#include "src/mc/mc_config.hpp"
+#include <string>
 
 /** Replay path (if any) in string representation
  *
  *  This is using the format generated by traceToString().
+ *  Use a function to avoid static initialization order fiasco.
  */
-#define MC_record_path (_sg_mc_record_path.get())
+inline auto& MC_record_path()
+{
+  static std::string value;
+  return value;
+}
 
 /** Whether the replay mode is enabled */
 static inline int MC_record_replay_is_active()
 {
-  return not MC_record_path.empty();
+  return not MC_record_path().empty();
 }
 
+/** Whether we should display extra information during this MC replay */
+extern bool simgrid_mc_replay_show_backtraces;
+
 #endif