Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / instr / instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index cf95509..65d5a63 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-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. */
@@ -24,7 +24,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 
 std::ofstream tracing_file;
 std::map<const simgrid::instr::Container*, std::ofstream*> tracing_files; // TI specific
-double prefix = 0.0;                                 // TI specific
 
 constexpr char OPT_TRACING_BASIC[]             = "tracing/basic";
 constexpr char OPT_TRACING_COMMENT_FILE[]      = "tracing/comment-file";
@@ -37,7 +36,8 @@ static simgrid::config::Flag<bool> trace_enabled{
     "tracing", "Enable the tracing system. You have to enable this option to use other tracing options.", false};
 
 static simgrid::config::Flag<bool> trace_actor_enabled{
-    "tracing/msg/process", // FIXME rename this flag
+    "tracing/actor",
+    {"tracing/msg/process"}, // XBT_ATTRIB_DEPRECATED_v330(option alias)
     "Trace the behavior of all categorized actors, grouping them by host. "
     "Can be used to track actor location if the simulator does actor migration.",
     false};
@@ -72,8 +72,8 @@ static simgrid::config::Flag<bool> trace_uncategorized{
     "To use if the simulator does not use tracing categories but resource utilization have to be traced.",
     false};
 
-static simgrid::config::Flag<bool> trace_disable_destroy{
-    OPT_TRACING_DISABLE_DESTROY, {"tracing/disable_destroy"}, "Disable platform containers destruction.", false};
+static simgrid::config::Flag<bool> trace_disable_destroy{OPT_TRACING_DISABLE_DESTROY,
+                                                         "Disable platform containers destruction.", false};
 static simgrid::config::Flag<bool> trace_basic{OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).",
                                                false};
 
@@ -268,6 +268,7 @@ static void on_container_creation_ti(const Container& c)
             SIMIX_get_clock());
   // if we are in the mode with only one file
   static std::ofstream* ti_unique_file = nullptr;
+  static double prefix                 = 0.0;
 
   if (tracing_files.empty()) {
     // generate unique run id with time
@@ -455,11 +456,9 @@ void init()
 
   config::declare_flag<bool>(OPT_TRACING_FORMAT_TI_ONEFILE,
                              "(smpi only) For replay format only : output to one file only", false);
-  config::alias(OPT_TRACING_FORMAT_TI_ONEFILE, {"tracing/smpi/format/ti_one_file"});
   config::declare_flag<std::string>("tracing/comment", "Add a comment line to the top of the trace file.", "");
   config::declare_flag<std::string>(OPT_TRACING_COMMENT_FILE,
                                     "Add the contents of a file as comments to the top of the trace.", "");
-  config::alias(OPT_TRACING_COMMENT_FILE, {"tracing/comment_file"});
   config::declare_flag<int>("tracing/precision",
                             "Numerical precision used when timestamping events "
                             "(expressed in number of digits after decimal point)",