X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..59649246c9a98ceda4bffa85ed4bd01a3c48adab:/src/bindings/java/jmsg_process.cpp

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 3e1faaee71..8a6509df80 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);
 
@@ -23,10 +22,10 @@ jfieldID jprocess_field_Process_name;
 jfieldID jprocess_field_Process_pid;
 jfieldID jprocess_field_Process_ppid;
 
-jobject jprocess_from_native(msg_process_t process)
+jobject jprocess_from_native(const simgrid::s4u::Actor* process)
 {
-  simgrid::kernel::context::JavaContext* context =
-      (simgrid::kernel::context::JavaContext*)process->get_impl()->context_;
+  const simgrid::kernel::context::JavaContext* context =
+      static_cast<simgrid::kernel::context::JavaContext*>(process->get_impl()->context_.get());
   return context->jprocess_;
 }
 
@@ -74,8 +73,12 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject
   jstring jname         = (jstring)env->GetObjectField(jprocess, jprocess_field_Process_name);
   const char* name      = env->GetStringUTFChars(jname, 0);
   simgrid::simix::ActorCode function = [jprocess]() { simgrid::kernel::context::java_main_jprocess(jprocess); };
-  smx_actor_t actor =
-      simcall_process_create(name, function, /*data*/ nullptr, jhost_get_native(env, jhost), /* properties*/ nullptr);
+  smx_actor_t self                   = SIMIX_process_self();
+  sg_host_t host                     = jhost_get_native(env, jhost);
+  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();
+  });
   MSG_process_yield();
 
   env->ReleaseStringUTFChars(jname, name);
@@ -107,7 +110,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid)
 {
-  msg_process_t process = MSG_process_from_PID(pid);
+  auto const* process = MSG_process_from_PID(pid);
 
   if (not process) {
     jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast<int>(pid)));
@@ -185,9 +188,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject
   process->resume();
 }
 
-JNIEXPORT void
-JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) {
-
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart(JNIEnv* env, jobject jprocess,
+                                                                   jboolean jauto_restart)
+{
   msg_process_t process = jprocess_to_native(jprocess, env);
   if (not process) {
     jxbt_throw_notbound(env, "process", jprocess);
@@ -224,23 +227,23 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
  {
   double time =  ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000;
-  msg_error_t rv;
-  try {
-    rv = MSG_process_sleep(time);
-  } catch (simgrid::kernel::context::Context::StopRequest const&) {
+  msg_error_t rv = MSG_OK;
+  if (not simgrid::ForcefulKillException::try_n_catch([&time]() { simgrid::s4u::this_actor::sleep_for(time); })) {
     rv = MSG_HOST_FAILURE;
   }
   if (rv != MSG_OK) {
-    XBT_DEBUG("Something during the MSG_process_sleep invocation was wrong, trigger a HostFailureException");
-
-    jxbt_throw_host_failure(env, "");
+    jmsg_throw_status(env, rv);
   }
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds)
 {
-  msg_error_t rv;
-  rv = MSG_process_sleep((double)jseconds);
+  msg_error_t rv = MSG_OK;
+  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");
+  }
   if (env->ExceptionOccurred())
     return;
   if (rv != MSG_OK) {
@@ -257,12 +260,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject j
     jxbt_throw_notbound(env, "process", jprocess);
     return;
   }
-  try {
-    MSG_process_kill(process);
-  } catch (xbt_ex& ex) {
-    XBT_VERB("Process %s just committed a suicide", MSG_process_get_name(process));
-    xbt_assert(process == MSG_process_self(),
-               "Killing a process should not raise an exception if it's not a suicide. Please report that bug.");
+  if (not simgrid::ForcefulKillException::try_n_catch([&process]() { MSG_process_kill(process); })) {
+    jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
   }
 }
 
@@ -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);