X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90b2d4e92cf44d2697fd1368e53f1aecbd24893e..62dceedf62ca9df19fd3afee1458e21d9f211c5a:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 4ecd54ea9e..2f1d5d75a8 100644 --- 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-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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 #include +#include #include +#include #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(simgrid::kernel::context::Context::self()); - return ctx->jenv_; + const JavaContext* ctx = static_cast(simgrid::kernel::context::Context::self()); + if (ctx) + return ctx->jenv_; + else + return nullptr; } void jmsg_throw_status(JNIEnv *env, msg_error_t status) { @@ -77,54 +82,56 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status) { * Unsortable functions * ***************************************************************************************/ -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls) +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv*, jclass) { return (jdouble) MSG_get_clock(); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv* env, jclass, 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(env->GetArrayLength(jargs)); + argc += static_cast(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 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 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) +JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv* env, jclass) { /* Run everything */ XBT_DEBUG("Ready to run MSG_MAIN"); @@ -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); @@ -155,7 +162,7 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass env->CallStaticVoidMethod(clsProcess, idDebug); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv* env, jclass, jstring jplatformFile) { const char *platformFile = env->GetStringUTFChars(jplatformFile, 0); @@ -164,7 +171,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, env->ReleaseStringUTFChars(jplatformFile, platformFile); } -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv* env, jclass) { msg_netzone_t as = MSG_zone_get_root(); jobject jas = jnetzone_new_instance(env); @@ -182,56 +189,55 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNI return (jobject) jas; } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_DEBUG("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_VERB("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_INFO("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_WARN("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_ERROR("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv* env, jclass, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_CRITICAL("%s", s); env->ReleaseStringUTFChars(js, s); } -static int java_main(int argc, char *argv[]); +static void java_main(int argc, char* argv[]); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv* env, jclass, jstring jdeploymentFile) { const char *deploymentFile = env->GetStringUTFChars(jdeploymentFile, 0); - SIMIX_function_register_default(java_main); + simgrid_register_default(java_main); MSG_launch_application(deploymentFile); } @@ -270,13 +276,12 @@ 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::xbt::Backtrace().display(); - simgrid::kernel::context::throw_stoprequest(); + simgrid::ForcefulKillException::do_throw(); } } /** Create a Java org.simgrid.msg.Process with the arguments and run it */ -static int java_main(int argc, char *argv[]) +static void java_main(int argc, char* argv[]) { JNIEnv *env = get_current_thread_env(); simgrid::kernel::context::JavaContext* context = @@ -306,7 +311,7 @@ static int java_main(int argc, char *argv[]) xbt_assert((jprocess != nullptr), "Process allocation failed."); jprocess = env->NewGlobalRef(jprocess); //bind the process to the context - msg_process_t process = MSG_process_self(); + const_sg_actor_t process = MSG_process_self(); context->jprocess_ = jprocess; /* sets the PID and the PPID of the process */ @@ -315,7 +320,6 @@ static int java_main(int argc, char *argv[]) jprocess_bind(jprocess, process, env); run_jprocess(env, context->jprocess_); - return 0; } namespace simgrid {