X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b9604890a31d41c3837bee248e8a77822d41ec7..16673e04b393c2d8c031d0d77ec318ac2c711f4e:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 86e69d9350..1af0c84cfc 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. */ @@ -9,6 +9,7 @@ #include #include +#include "simgrid/Exception.hpp" #include "simgrid/msg.h" #include "simgrid/plugins/energy.h" #include "simgrid/plugins/file_system.h" @@ -30,7 +31,6 @@ #include "JavaContext.hpp" -#include /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */ #ifndef JNIEXPORT @@ -50,8 +50,8 @@ JavaVM *__java_vm = nullptr; JNIEnv *get_current_thread_env() { using simgrid::kernel::context::JavaContext; - JavaContext* ctx = static_cast(xbt_os_thread_get_extra_data()); - return ctx->jenv; + JavaContext* ctx = static_cast(simgrid::kernel::context::Context::self()); + return ctx->jenv_; } void jmsg_throw_status(JNIEnv *env, msg_error_t status) { @@ -133,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++) { @@ -141,13 +141,25 @@ 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); + + // Don't even report the surviving threads, just to pass the tests... + 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); + + /* FIXME: don't be of such an EXTREM BRUTALITY to stop the jvm. + * Sorry I don't get it working otherwise: some thread survive their own end, and I fail to do anything better */ + exit(0); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile) @@ -242,7 +254,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit() 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. @@ -255,17 +266,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(); + throw simgrid::kernel::context::Context::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(SIMIX_context_self()); + simgrid::kernel::context::JavaContext* context = + static_cast(simgrid::kernel::context::Context::self()); //Change the "." in class name for "/". std::string arg0 = argv[0]; @@ -293,13 +315,13 @@ static int java_main(int argc, char *argv[]) //bind the process to the context msg_process_t process = MSG_process_self(); - context->jprocess = jprocess; + context->jprocess_ = jprocess; /* sets the PID and the PPID of the process */ env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast(MSG_process_get_PID(process))); env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast(MSG_process_get_PPID(process))); jprocess_bind(jprocess, process, env); - run_jprocess(env, context->jprocess); + run_jprocess(env, context->jprocess_); return 0; } @@ -311,10 +333,11 @@ namespace context { void java_main_jprocess(jobject jprocess) { JNIEnv *env = get_current_thread_env(); - simgrid::kernel::context::JavaContext* context = static_cast(SIMIX_context_self()); - context->jprocess = jprocess; - jprocess_bind(context->jprocess, MSG_process_self(), env); + simgrid::kernel::context::JavaContext* context = + static_cast(simgrid::kernel::context::Context::self()); + context->jprocess_ = jprocess; + jprocess_bind(context->jprocess_, MSG_process_self(), env); - run_jprocess(env, context->jprocess); + run_jprocess(env, context->jprocess_); } }}}