deal with MSG and Java too

[simgrid.git] / src / msg / msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index f01dbc2..3e18336 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -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/config.hpp>
 
 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<bool>("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);
-}