X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce9cbf0e2aea0198cb08a735a3ad36c6471f5468..b9625f82f86db0674e911887addce45dca31b57f:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 944919d0ff..6b71078aed 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -1,32 +1,35 @@ -/* Java Wrappers to the MSG API. */ - -/* Copyright (c) 2007-2017. 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 -#include -#include -#include +#include "simgrid/Exception.hpp" +#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 +#include "simgrid/s4u/Host.hpp" -#include +#include "src/simix/smx_private.hpp" -#include "jmsg_process.h" -#include "jmsg_as.h" +#include "jmsg.hpp" +#include "jmsg_as.hpp" #include "jmsg_host.h" +#include "jmsg_process.h" #include "jmsg_storage.h" #include "jmsg_task.h" -#include "jxbt_utilities.h" -#include "jmsg.h" +#include "jxbt_utilities.hpp" #include "JavaContext.hpp" -#include - /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */ #ifndef JNIEXPORT #define JNIEXPORT @@ -36,42 +39,36 @@ #endif /* end of eclipse-mandated pimple */ -SG_BEGIN_DECL() - int JAVA_HOST_LEVEL = -1; -int JAVA_STORAGE_LEVEL = -1; -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); JavaVM *__java_vm = nullptr; -JavaVM *get_java_VM() -{ - return __java_vm; -} - JNIEnv *get_current_thread_env() { - JNIEnv *env; - - __java_vm->AttachCurrentThread((void **) &env, nullptr); - return env; + using simgrid::kernel::context::JavaContext; + 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) { switch (status) { case MSG_TIMEOUT: - jxbt_throw_time_out_failure(env,nullptr); - break; + jxbt_throw_time_out_failure(env, ""); + break; case MSG_TRANSFER_FAILURE: - jxbt_throw_transfer_failure(env,nullptr); - break; + jxbt_throw_transfer_failure(env, ""); + break; case MSG_HOST_FAILURE: - jxbt_throw_host_failure(env,nullptr); - break; + jxbt_throw_host_failure(env, ""); + break; case MSG_TASK_CANCELED: - jxbt_throw_task_cancelled(env,nullptr); - break; + jxbt_throw_task_cancelled(env, ""); + break; default: xbt_die("undefined message failed (please see jmsg_throw_status function in jmsg.cpp)"); } @@ -81,118 +78,102 @@ 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) -{ - return (jdouble) MSG_get_clock(); -} - -static void __JAVA_host_priv_free(void *host) +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv*, jclass) { + return (jdouble)simgrid_get_clock(); } -static void __JAVA_storage_priv_free(void *storage) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv* env, jclass, jobjectArray jargs) { -} - -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) -{ - char **argv = nullptr; - int index; - int argc = 0; - jstring jval; - const char *tmp; - - XBT_LOG_CONNECT(jmsg); - XBT_LOG_CONNECT(jtrace); - 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 = (int) env->GetArrayLength(jargs); - - argc++; - argv = xbt_new(char *, argc + 1); - argv[0] = xbt_strdup("java"); - - for (index = 0; index < argc - 1; index++) { - jval = (jstring) env->GetObjectArrayElement(jargs, index); - tmp = env->GetStringUTFChars(jval, 0); - argv[index + 1] = xbt_strdup(tmp); + argc += static_cast(env->GetArrayLength(jargs)); + xbt_assert(argc > 0); + + // 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); + + 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); + args.emplace_back(tmp); env->ReleaseStringUTFChars(jval, tmp); } - argv[argc] = nullptr; - MSG_init(&argc, argv); + 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; - JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(__JAVA_host_priv_free); - JAVA_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, __JAVA_storage_priv_free); + int argc2 = argc; + MSG_init(&argc2, argv.get()); + xbt_assert(argc2 <= argc); - for (index = 0; index < argc; index++) - free(argv[index]); + for (int index = 1; index < argc2; index++) + env->SetObjectArrayElement(jargs, index - 1, (jstring)env->NewStringUTF(argv[index])); - free(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"); - msg_error_t rv = MSG_main(); - XBT_DEBUG("Done running MSG_MAIN"); - 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_DEBUG("Ready to run"); + simgrid_run(); + XBT_DEBUG("Done running"); + XBT_INFO("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++) { - msg_host_t msg_host = xbt_dynar_get_as(hosts,index,msg_host_t); - jobject jhost = (jobject) msg_host->extension(JAVA_HOST_LEVEL); + sg_host_t* hosts = sg_host_list(); + size_t host_count = sg_host_count(); + for (size_t index = 0; index < host_count - 1; index++) { + jobject jhost = (jobject)hosts[index]->extension(JAVA_HOST_LEVEL); if (jhost) jhost_unref(env, jhost); - } - xbt_dynar_free(&hosts); + xbt_free(hosts); /* Cleanup java storages */ - xbt_dynar_t storages = MSG_storages_as_dynar(); - if(!xbt_dynar_is_empty(storages)){ - for (unsigned long index = 0; index < xbt_dynar_length(storages) - 1; index++) { - jobject jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL); - if (jstorage) - jstorage_unref(env, jstorage); - } - } - xbt_dynar_free(&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) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv* env, jclass, jstring jplatformFile) { const char *platformFile = env->GetStringUTFChars(jplatformFile, 0); - MSG_create_environment(platformFile); + simgrid_load_platform(platformFile); 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_environment_get_routing_root(); + sg_netzone_t as = sg_zone_get_root(); jobject jas = jnetzone_new_instance(env); - if (!jas) { + if (not jas) { jxbt_throw_jni(env, "java As instantiation failed"); return nullptr; } jas = jnetzone_ref(env, jas); - if (!jas) { + if (not jas) { jxbt_throw_jni(env, "new global ref allocation failed"); return nullptr; } @@ -201,65 +182,70 @@ 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); - MSG_launch_application(deploymentFile); + simgrid_register_default(java_main); + simgrid_load_deployment(deploymentFile); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() { sg_host_energy_plugin_init(); } -SG_END_DECL() +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. @@ -270,24 +256,34 @@ static void run_jprocess(JNIEnv *env, jobject jprocess) // wait for the process's start time jfieldID jprocess_field_Process_startTime = jxbt_get_sfield(env, "org/simgrid/msg/Process", "startTime", "D"); jdouble startTime = env->GetDoubleField(jprocess, jprocess_field_Process_startTime); - if (startTime > MSG_get_clock()) - MSG_process_sleep(startTime - MSG_get_clock()); + if (startTime > simgrid_get_clock()) + simgrid::s4u::this_actor::sleep_for(startTime - simgrid_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::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 = static_cast(SIMIX_context_self()); + simgrid::kernel::context::JavaContext* context = + static_cast(simgrid::kernel::context::Context::self()); //Change the "." in class name for "/". - xbt_str_subst(argv[0],'.','/',0); - jclass class_Process = env->FindClass(argv[0]); - xbt_str_subst(argv[0],'/','.',0); + std::string arg0 = argv[0]; + std::replace(begin(arg0), end(arg0), '.', '/'); + jclass class_Process = env->FindClass(arg0.c_str()); //Retrieve the methodID for the constructor xbt_assert((class_Process != nullptr), "Class not found (%s). The deployment file must use the fully qualified class name, including the package. The case is important.", argv[0]); jmethodID constructor_Process = env->GetMethodID(class_Process, "", "(Lorg/simgrid/msg/Host;Ljava/lang/String;[Ljava/lang/String;)V"); @@ -301,23 +297,22 @@ static int java_main(int argc, char *argv[]) for (int i = 1; i < argc; i++) env->SetObjectArrayElement(args,i - 1, env->NewStringUTF(argv[i])); //Retrieve the host for the process. - jstring jhostName = env->NewStringUTF(MSG_host_self()->cname()); + jstring jhostName = env->NewStringUTF(simgrid::s4u::Host::current()->get_cname()); jobject jhost = Java_org_simgrid_msg_Host_getByName(env, nullptr, jhostName); //creates the process jobject jprocess = env->NewObject(class_Process, constructor_Process, jhost, jname, args); 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 actor = sg_actor_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); + env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast(actor->get_pid())); + env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast(actor->get_ppid())); + jprocess_bind(jprocess, actor, env); - run_jprocess(env, context->jprocess); - return 0; + run_jprocess(env, context->jprocess_); } namespace simgrid { @@ -328,13 +323,12 @@ 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; - smx_actor_t process = SIMIX_process_self(); - jprocess_bind(context->jprocess, process, env); - - // Adrien, ugly path, just to bypass creation of context at low levels (i.e such as for the VM migration for instance) - if (context->jprocess != nullptr) - run_jprocess(env, context->jprocess); + JavaContext* context = static_cast(Context::self()); + context->jprocess_ = jprocess; + jprocess_bind(context->jprocess_, sg_actor_self(), env); + + run_jprocess(env, context->jprocess_); } -}}} +} // namespace context +} // namespace kernel +} // namespace simgrid