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

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 053f6ce802..4ecd54ea9e 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -1,6 +1,6 @@
 /* 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. */
@@ -14,6 +14,7 @@
 #include "simgrid/plugins/energy.h"
 #include "simgrid/plugins/file_system.h"
 #include "simgrid/plugins/live_migration.h"
+#include "simgrid/plugins/load.h"
 #include "simgrid/simix.h"
 
 #include "simgrid/s4u/Host.hpp"
@@ -49,7 +50,7 @@ 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());
+  JavaContext* ctx = static_cast<JavaContext*>(simgrid::kernel::context::Context::self());
   return ctx->jenv_;
 }
 
@@ -132,7 +133,7 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass
   jxbt_check_res("MSG_main()", rv, MSG_OK,
                  xbt_strdup("unexpected error : MSG_main() failed .. please report this bug "));
 
-  XBT_INFO("MSG_main finished; Cleaning up the simulation...");
+  XBT_INFO("MSG_main finished; Terminating the simulation...");
   /* Cleanup java hosts */
   xbt_dynar_t hosts = MSG_hosts_as_dynar();
   for (unsigned long index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
@@ -140,13 +141,18 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass
     jobject jhost = (jobject) msg_host->extension(JAVA_HOST_LEVEL);
     if (jhost)
       jhost_unref(env, jhost);
-
   }
   xbt_dynar_free(&hosts);
 
   /* Cleanup java storages */
   for (auto const& elm : java_storage_map)
     jstorage_unref(env, elm.second);
+
+  /* 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)
@@ -238,6 +244,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
   sg_storage_file_system_init();
 }
 
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_loadInit() {
+    sg_host_load_plugin_init();
+}
 /** Run a Java org.simgrid.msg.Process
  *
  *  If needed, this waits for the process starting time.
@@ -250,17 +259,28 @@ static void run_jprocess(JNIEnv *env, jobject jprocess)
   jdouble startTime = env->GetDoubleField(jprocess, jprocess_field_Process_startTime);
   if (startTime > MSG_get_clock())
     MSG_process_sleep(startTime - MSG_get_clock());
+
   //Execution of the "run" method.
   jmethodID id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "run", "()V");
-  xbt_assert((id != nullptr), "Method run() not found...");
+  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 */
 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];
@@ -306,7 +326,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);