Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
migrate to set_host in java too
[simgrid.git] / src / bindings / java / jmsg_process.cpp
index 0cfc805..cb71bba 100644 (file)
@@ -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();
   });
@@ -283,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);