X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6042678d235eeddfa0b7120c17c7fb4362881a88..76d6142db426f3e11da8367dbad7b1c39fec3165:/src/msg/msg_global.cpp diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index 7e250dc00d..70480e1203 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -6,8 +6,8 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "instr/instr_interface.hpp" #include "mc/mc.h" +#include "src/instr/instr_private.hpp" #include "src/msg/msg_private.hpp" #include @@ -33,8 +33,8 @@ void MSG_init_nocheck(int *argc, char **argv) { msg_global = new s_MSG_Global_t(); msg_global->debug_multiple_use = false; - simgrid::config::bindFlag(msg_global->debug_multiple_use, "msg/debug-multiple-use", - "Print backtraces of both processes when there is a conflict of multiple use of a task"); + simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use", + "Print backtraces of both processes when there is a conflict of multiple use of a task"); SIMIX_global_init(argc, argv); @@ -51,7 +51,7 @@ void MSG_init_nocheck(int *argc, char **argv) { MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg)); } - if (xbt_cfg_get_boolean("clean-atexit")) + if (simgrid::config::get_value("clean-atexit")) atexit(MSG_exit); } @@ -82,7 +82,7 @@ msg_error_t MSG_main() */ void MSG_config(const char *key, const char *value){ xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()"); - xbt_cfg_set_as_string(key, value); + simgrid::config::set_as_string(key, value); } /** \ingroup msg_simulation @@ -100,7 +100,6 @@ static void MSG_exit() { if (msg_global==nullptr) return; - TRACE_end(); delete msg_global; msg_global = nullptr; }