From: SUTER Frederic <frederic.suter@cc.in2p3.fr>
Date: Fri, 17 Sep 2021 10:14:13 +0000 (+0200)
Subject: deal with MSG and Java too
X-Git-Tag: v3.29~80^2~3
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7a3e94ca4fe07f112f3efc9b8061e44097895aee?ds=sidebyside

deal with MSG and Java too
---

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index e1a1e4e923..48e1da96e2 100644
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -8,7 +8,6 @@
 #include "JavaContext.hpp"
 #include "jxbt_utilities.hpp"
 #include "simgrid/Exception.hpp"
-#include "src/simix/smx_private.hpp"
 
 #include <functional>
 #include <utility>
diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 39f01a91fe..938819dac8 100644
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -13,7 +13,6 @@
 
 #include "simgrid/simix.h"
 #include "src/kernel/context/ContextThread.hpp"
-#include "src/simix/smx_private.hpp"
 
 #include "jmsg.hpp"
 
diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index cb08bb5ae4..70d99fa772 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -16,10 +16,9 @@
 #include "simgrid/plugins/load.h"
 #include "simgrid/simix.h"
 
+#include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Host.hpp"
 
-#include "src/simix/smx_private.hpp"
-
 #include "jmsg.hpp"
 #include "jmsg_as.hpp"
 #include "jmsg_host.h"
diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 81443177fa..85471221be 100644
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -12,6 +12,8 @@
 #include "jmsg_host.h"
 #include "jxbt_utilities.hpp"
 #include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Actor.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index f1610fe7ee..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/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();