Rename StopRequest into ForcefulKillException to contribute to #325

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

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 5ff074a..17a86a4 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -1,13 +1,15 @@
 /* Java Wrappers to the MSG API.                                            */
 
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <algorithm>
 #include <clocale>
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "simgrid/Exception.hpp"
 #include "simgrid/msg.h"
@@ -50,8 +52,11 @@ JavaVM *__java_vm = nullptr;
 JNIEnv *get_current_thread_env()
 {
   using simgrid::kernel::context::JavaContext;
-  JavaContext* ctx = static_cast<JavaContext*>(xbt_os_thread_get_extra_data());
-  return ctx->jenv_;
+  JavaContext* ctx = static_cast<JavaContext*>(simgrid::kernel::context::Context::self());
+  if (ctx)
+    return ctx->jenv_;
+  else
+    return nullptr;
 }
 
 void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
@@ -84,8 +89,6 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 {
-  int argc = 0;
-
   env->GetJavaVM(&__java_vm);
 
   simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory;
@@ -96,32 +99,36 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
 
   setlocale(LC_NUMERIC,"C");
 
+  int argc = 1;
   if (jargs)
-    argc = static_cast<int>(env->GetArrayLength(jargs));
+    argc += static_cast<int>(env->GetArrayLength(jargs));
+  xbt_assert(argc > 0);
 
-  argc++;
-  char** argv = new char*[argc + 1];
-  argv[0] = xbt_strdup("java");
+  // Need a static storage because the XBT layer saves the arguments in xbt_binary_name and xbt_cmdline.
+  static std::vector<std::string> args;
+  args.reserve(argc);
 
-  for (int index = 0; index < argc - 1; index++) {
-    jstring jval    = (jstring)env->GetObjectArrayElement(jargs, index);
+  args.emplace_back("java");
+  for (int index = 1; index < argc; index++) {
+    jstring jval    = (jstring)env->GetObjectArrayElement(jargs, index - 1);
     const char* tmp = env->GetStringUTFChars(jval, 0);
-    argv[index + 1] = xbt_strdup(tmp);
+    args.emplace_back(tmp);
     env->ReleaseStringUTFChars(jval, tmp);
   }
+
+  std::unique_ptr<char* []> argv(new char*[argc + 1]);
+  std::transform(begin(args), end(args), argv.get(), [](std::string& s) { return &s.front(); });
   argv[argc] = nullptr;
 
-  MSG_init(&argc, argv);
-  sg_vm_live_migration_plugin_init();
+  int argc2 = argc;
+  MSG_init(&argc2, argv.get());
+  xbt_assert(argc2 <= argc);
 
-  JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
+  for (int index = 1; index < argc2; index++)
+    env->SetObjectArrayElement(jargs, index - 1, (jstring)env->NewStringUTF(argv[index]));
 
-  for (int index = 0; index < argc - 1; index++) {
-    env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1]));
-    free(argv[index]);
-  }
-  free(argv[argc]);
-  delete[] argv;
+  sg_vm_live_migration_plugin_init();
+  JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
 }
 
 JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
@@ -148,9 +155,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,13 +272,21 @@ 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::kernel::context::ForcefulKillException::do_throw();
+  }
 }
 
 /** Create a Java org.simgrid.msg.Process with the arguments and run it */
 static int java_main(int argc, char *argv[])
 {
   JNIEnv *env = get_current_thread_env();
-  simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
+  simgrid::kernel::context::JavaContext* context =
+      static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
 
   //Change the "." in class name for "/".
   std::string arg0 = argv[0];
@@ -315,7 +332,8 @@ namespace context {
 void java_main_jprocess(jobject jprocess)
 {
   JNIEnv *env = get_current_thread_env();
-  simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
+  simgrid::kernel::context::JavaContext* context =
+      static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
   context->jprocess_                             = jprocess;
   jprocess_bind(context->jprocess_, MSG_process_self(), env);