X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e1b4fa835cedc144a2ebe97fda0d139d63d3058..1fc042e8bc9c51f9267fa1936deaebe59ae01ee7:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index f8fff3947d..6119a6402f 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -1,28 +1,29 @@ /* Java Wrappers to the MSG API. */ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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 "simgrid/msg.h" +#include "simgrid/plugins/energy.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" @@ -37,12 +38,11 @@ #endif /* end of eclipse-mandated pimple */ -SG_BEGIN_DECL() +extern "C" { 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; @@ -53,29 +53,27 @@ JavaVM *get_java_VM() JNIEnv *get_current_thread_env() { - JNIEnv *env; - - __java_vm->AttachCurrentThread((void **) &env, nullptr); - return env; + using simgrid::kernel::context::JavaContext; + JavaContext* ctx = static_cast(xbt_os_thread_get_extra_data()); + return ctx->jenv; } 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: - jxbt_throw_native(env,xbt_strdup("undefined message failed " - "(please see jmsg_throw_status function in jmsg.cpp)")); + xbt_die("undefined message failed (please see jmsg_throw_status function in jmsg.cpp)"); } } @@ -92,19 +90,11 @@ static void __JAVA_host_priv_free(void *host) { } -static void __JAVA_storage_priv_free(void *storage) -{ -} - 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(java); XBT_LOG_CONNECT(jtrace); env->GetJavaVM(&__java_vm); @@ -118,15 +108,15 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j setlocale(LC_NUMERIC,"C"); if (jargs) - argc = (int) env->GetArrayLength(jargs); + argc = static_cast(env->GetArrayLength(jargs)); argc++; - argv = xbt_new(char *, argc + 1); + char** argv = 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); + for (int index = 0; index < argc - 1; index++) { + jstring jval = (jstring)env->GetObjectArrayElement(jargs, index); + const char* tmp = env->GetStringUTFChars(jval, 0); argv[index + 1] = xbt_strdup(tmp); env->ReleaseStringUTFChars(jval, tmp); } @@ -135,12 +125,13 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j MSG_init(&argc, argv); 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); - for (index = 0; index < argc; index++) + for (int index = 0; index < argc - 1; index++) { + env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1])); free(argv[index]); - - free(argv); + } + free(argv[argc]); + delete[] argv; } JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) @@ -165,15 +156,8 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass xbt_dynar_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); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile) @@ -187,18 +171,18 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) { - msg_netzone_t as = MSG_environment_get_routing_root(); - jobject jas = jas_new_instance(env); - if (!jas) { + msg_netzone_t as = MSG_zone_get_root(); + jobject jas = jnetzone_new_instance(env); + if (not jas) { jxbt_throw_jni(env, "java As instantiation failed"); return nullptr; } - jas = jas_ref(env, jas); - if (!jas) { + jas = jnetzone_ref(env, jas); + if (not jas) { jxbt_throw_jni(env, "new global ref allocation failed"); return nullptr; } - jas_bind(jas, as, env); + jnetzone_bind(jas, as, env); return (jobject) jas; } @@ -256,11 +240,10 @@ Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jde MSG_launch_application(deploymentFile); } -SG_END_DECL() - JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() { - sg_energy_plugin_init(); + sg_host_energy_plugin_init(); } +} // extern "C" /** Run a Java org.simgrid.msg.Process * @@ -287,9 +270,9 @@ static int java_main(int argc, char *argv[]) simgrid::kernel::context::JavaContext* context = static_cast(SIMIX_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"); @@ -303,7 +286,7 @@ 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(MSG_host_self()->getCname()); 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); @@ -332,11 +315,8 @@ 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); + jprocess_bind(context->jprocess, MSG_process_self(), 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); + run_jprocess(env, context->jprocess); } }}}