Stop using Context::StopRequest directly in libsimgrid-java.

[simgrid.git] / src / bindings / java / jmsg_task.cpp

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index 3207b73..14764bd 100644 (file)
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/Host.hpp"
+#include "src/kernel/context/Context.hpp"
 
 #include "jmsg.hpp"
 #include "jmsg_host.h"
@@ -126,7 +127,10 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject j
     return;
   }
   msg_error_t rv;
-  rv = MSG_task_execute(task);
+  simgrid::kernel::context::try_n_catch_stoprequest(
+      [&rv, &task]() { rv = MSG_task_execute(task); },
+      [&env] { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
+
   if (env->ExceptionOccurred())
     return;
   if (rv != MSG_OK) {
@@ -281,12 +285,17 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv* env, jclass
   msg_task_t task = nullptr;
 
   const char *alias = env->GetStringUTFChars(jalias, 0);
-  msg_error_t rv    = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr);
+  msg_error_t rv;
+  simgrid::kernel::context::try_n_catch_stoprequest(
+      [&rv, &task, &alias, &jtimeout]() {
+        rv = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr);
+      },
+      [&env]() { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
   env->ReleaseStringUTFChars(jalias, alias);
   if (env->ExceptionOccurred())
     return nullptr;
   if (rv != MSG_OK) {
-    jmsg_throw_status(env,rv);
+    jmsg_throw_status(env, rv);
     return nullptr;
   }
   jobject jtask_global = (jobject) MSG_task_get_data(task);
@@ -467,7 +476,6 @@ static void msg_task_cancel_on_failed_dsend(void*t) {
   /* Destroy the global ref so that the JVM can free the stuff */
   env->DeleteGlobalRef(jtask_global);
   MSG_task_set_data(task, nullptr);
-  MSG_task_destroy(task);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, jstring jalias)