X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..7a3e94ca4fe07f112f3efc9b8061e44097895aee:/src/msg/msg_global.cpp diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index e44c094cc9..3e183363a4 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -7,8 +7,8 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/instr/instr_private.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/msg/msg_private.hpp" -#include "src/simix/smx_private.hpp" #include XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); @@ -34,7 +34,7 @@ void MSG_init_nocheck(int* argc, char** argv) simgrid::config::bind_flag(MSG_Global_t::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); + simgrid::kernel::EngineImpl::get_instance(argc, argv); msg_global = new MSG_Global_t(); @@ -51,7 +51,7 @@ void MSG_init_nocheck(int* argc, char** argv) if(MC_is_active()){ /* Ignore total amount of messages sent during the simulation for heap comparison */ - MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg)); + MC_ignore_heap(&msg_global->sent_msg, sizeof msg_global->sent_msg); } if (simgrid::config::get_value("debug/clean-atexit")) @@ -74,9 +74,3 @@ unsigned long int MSG_get_sent_msg() { return msg_global->sent_msg; } - -/** @brief register functions bypassing the parser */ -void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments) -{ - SIMIX_process_set_function(host_id, function_name, arguments, -1, -1); -}