X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60ce0b9f4a108a6a7b1d6c883511e21645a853c1..c8f375f14b9e04a4dd1767cb70c70b6dfc173f9c:/src/bindings/java/jmsg.cpp?ds=sidebyside

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 4b81f4ed88..15f74c1f0b 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -7,7 +7,9 @@
 
 #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*>(simgrid::kernel::context::Context::self());
-  return ctx->jenv_;
+  const 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,44 +89,46 @@ 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;
-  jthrowable exc = env->ExceptionOccurred();
+  const _jthrowable* exc                        = env->ExceptionOccurred();
   if (exc) {
     env->ExceptionClear();
   }
 
   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)
@@ -137,7 +144,7 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass
   /* Cleanup java hosts */
   xbt_dynar_t hosts = MSG_hosts_as_dynar();
   for (unsigned long index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
-    msg_host_t msg_host = xbt_dynar_get_as(hosts,index,msg_host_t);
+    auto const* msg_host = xbt_dynar_get_as(hosts, index, msg_host_t);
     jobject jhost = (jobject) msg_host->extension(JAVA_HOST_LEVEL);
     if (jhost)
       jhost_unref(env, jhost);
@@ -231,7 +238,7 @@ Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jde
 {
   const char *deploymentFile = env->GetStringUTFChars(jdeploymentFile, 0);
 
-  SIMIX_function_register_default(java_main);
+  simgrid_register_default(java_main);
   MSG_launch_application(deploymentFile);
 }
 
@@ -270,7 +277,7 @@ static void run_jprocess(JNIEnv *env, jobject jprocess)
     env->ExceptionClear();
     XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread();
     xbt_assert(error == JNI_OK, "Cannot detach failing thread");
-    simgrid::kernel::context::StopRequest::do_throw();
+    simgrid::ForcefulKillException::do_throw();
   }
 }