X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e46fb705a7ae3d90e14ea3b9a0cc9b4e9007f99..9b4ac8fd04e749d0737479e3b02074be4ad3f2ab:/src/bindings/java/jmsg_process.cpp

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 0d0866cba9..cb71bba6df 100644
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -12,7 +12,6 @@
 #include "jmsg_host.h"
 #include "jxbt_utilities.hpp"
 #include "simgrid/Exception.hpp"
-#include "src/simix/ActorImpl.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
@@ -26,7 +25,7 @@ jfieldID jprocess_field_Process_ppid;
 jobject jprocess_from_native(msg_process_t process)
 {
   simgrid::kernel::context::JavaContext* context =
-      (simgrid::kernel::context::JavaContext*)process->get_impl()->context_;
+      static_cast<simgrid::kernel::context::JavaContext*>(process->get_impl()->context_.get());
   return context->jprocess_;
 }
 
@@ -76,7 +75,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject
   simgrid::simix::ActorCode function = [jprocess]() { simgrid::kernel::context::java_main_jprocess(jprocess); };
   smx_actor_t self                   = SIMIX_process_self();
   sg_host_t host                     = jhost_get_native(env, jhost);
-  smx_actor_t actor                  = simgrid::simix::simcall([name, function, host, self] {
+  smx_actor_t actor                  = simgrid::kernel::actor::simcall([name, function, host, self] {
     return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(function), nullptr, host, nullptr, self)
         .get();
   });
@@ -229,8 +228,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cl
  {
   double time =  ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000;
   msg_error_t rv = MSG_OK;
-  if (not simgrid::kernel::context::ForcefulKillException::try_n_catch(
-          [&time]() { simgrid::s4u::this_actor::sleep_for(time); })) {
+  if (not simgrid::ForcefulKillException::try_n_catch([&time]() { simgrid::s4u::this_actor::sleep_for(time); })) {
     rv = MSG_HOST_FAILURE;
   }
   if (rv != MSG_OK) {
@@ -241,7 +239,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cl
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds)
 {
   msg_error_t rv = MSG_OK;
-  if (not simgrid::kernel::context::ForcefulKillException::try_n_catch(
+  if (not simgrid::ForcefulKillException::try_n_catch(
           [&jseconds]() { simgrid::s4u::this_actor::sleep_for((double)jseconds); })) {
     rv = MSG_HOST_FAILURE;
     jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
@@ -262,7 +260,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject j
     jxbt_throw_notbound(env, "process", jprocess);
     return;
   }
-  if (not simgrid::kernel::context::ForcefulKillException::try_n_catch([&process]() { MSG_process_kill(process); })) {
+  if (not simgrid::ForcefulKillException::try_n_catch([&process]() { MSG_process_kill(process); })) {
     jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
   }
 }
@@ -284,7 +282,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobjec
   }
 
   /* change the host of the process */
-  process->migrate(host);
+  process->set_host(host);
 
   /* change the host java side */
   env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);