X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..90b2d4e92cf44d2697fd1368e53f1aecbd24893e:/src/bindings/java/jmsg.cpp

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 085486b5bf..4ecd54ea9e 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -148,9 +148,11 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass
   for (auto const& elm : java_storage_map)
     jstorage_unref(env, elm.second);
 
-  /* FIXME: don't be of such an EXTREM BRUTALITY to stop the jvm. Sorry I don't get it working otherwise.
-   * See the comment in ActorImpl.cpp::SIMIX_process_kill() */
-  exit(0);
+  /* Display the status of remaining threads. None should survive, but who knows */
+  jclass clsProcess = jxbt_get_class(env, "org/simgrid/msg/Process");
+  jmethodID idDebug = jxbt_get_static_jmethod(env, clsProcess, "debugAllThreads", "()V");
+  xbt_assert(idDebug != nullptr, "Method Process.debugAllThreads() not found...");
+  env->CallStaticVoidMethod(clsProcess, idDebug);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile)
@@ -263,6 +265,14 @@ static void run_jprocess(JNIEnv *env, jobject jprocess)
   xbt_assert((id != nullptr), "Method Process.run() not found...");
 
   env->CallVoidMethod(jprocess, id);
+  if (env->ExceptionOccurred()) {
+    XBT_DEBUG("Something went wrong in this Java actor, forget about it.");
+    env->ExceptionClear();
+    XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread();
+    xbt_assert(error == JNI_OK, "Cannot detach failing thread");
+    // simgrid::xbt::Backtrace().display();
+    simgrid::kernel::context::throw_stoprequest();
+  }
 }
 
 /** Create a Java org.simgrid.msg.Process with the arguments and run it */