Merge branch 'master' of https://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 415e3ba..fcddfde 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -6,6 +6,7 @@
 #include "include/xbt/config.hpp"
 #include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Engine.hpp"
+#include "simgrid/version.h"
 #include "src/instr/instr_private.hpp"
 #include "surf/surf.hpp"
 #include "xbt/virtu.h" /* xbt_cmdline */
@@ -268,11 +269,11 @@ std::string TRACE_get_filename()
 
 void TRACE_global_init()
 {
-  static bool is_initialised = false;
-  if (is_initialised)
+  static bool is_initialized = false;
+  if (is_initialized)
     return;
 
-  is_initialised = true;
+  is_initialized = true;
 
   /* name of the tracefile */
   simgrid::config::declare_flag<std::string>("tracing/filename", "Trace file created by the instrumented SimGrid.",
@@ -294,9 +295,9 @@ void TRACE_global_init()
                                      6);
 
   /* Connect callbacks */
-  simgrid::s4u::on_platform_creation.connect(TRACE_start);
-  simgrid::s4u::on_deadlock.connect(TRACE_end);
-  simgrid::s4u::on_simulation_end.connect(TRACE_end);
+  simgrid::s4u::Engine::on_platform_creation.connect(TRACE_start);
+  simgrid::s4u::Engine::on_deadlock.connect(TRACE_end);
+  simgrid::s4u::Engine::on_simulation_end.connect(TRACE_end);
 }
 
 static void print_line(const char* option, const char* desc, const char* longdesc)