X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/494abb77daa472be264899fea23876ed28a6be63..ef1b10a74dde75e195d7897449975b6834f3cb06:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index eeb39838df..7ffbb238d1 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -1,14 +1,18 @@ /* 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 "jmsg_process.h" @@ -21,6 +25,8 @@ #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 @@ -35,40 +41,38 @@ 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 = NULL; +JavaVM *__java_vm = nullptr; -JavaVM *get_java_VM(void) +JavaVM *get_java_VM() { return __java_vm; } -JNIEnv *get_current_thread_env(void) +JNIEnv *get_current_thread_env() { - JNIEnv *env; - - __java_vm->AttachCurrentThread((void **) &env, NULL); - 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,NULL); - break; + jxbt_throw_time_out_failure(env, ""); + break; case MSG_TRANSFER_FAILURE: - jxbt_throw_transfer_failure(env,NULL); - break; + jxbt_throw_transfer_failure(env, ""); + break; case MSG_HOST_FAILURE: - jxbt_throw_host_failure(env,NULL); - break; + jxbt_throw_host_failure(env, ""); + break; case MSG_TASK_CANCELED: - jxbt_throw_task_cancelled(env,NULL); - 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)"); } } @@ -91,18 +95,18 @@ 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 = NULL; + 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); - simgrid::simix::factory_initializer = simgrid::java::java_factory; + simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory; jthrowable exc = env->ExceptionOccurred(); if (exc) { env->ExceptionClear(); @@ -111,7 +115,7 @@ 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); @@ -123,16 +127,18 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j argv[index + 1] = xbt_strdup(tmp); env->ReleaseStringUTFChars(jval, tmp); } - argv[argc] = NULL; + argv[argc] = nullptr; 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 (index = 0; index < argc - 1; index++) { + env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1])); free(argv[index]); - + } + free(argv[argc]); free(argv); } @@ -180,18 +186,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_as_t as = MSG_environment_get_routing_root(); - jobject jas = jas_new_instance(env); + msg_netzone_t as = MSG_environment_get_routing_root(); + jobject jas = jnetzone_new_instance(env); if (!jas) { jxbt_throw_jni(env, "java As instantiation failed"); - return NULL; + return nullptr; } - jas = jas_ref(env, jas); + jas = jnetzone_ref(env, jas); if (!jas) { jxbt_throw_jni(env, "new global ref allocation failed"); - return NULL; + return nullptr; } - jas_bind(jas, as, env); + jnetzone_bind(jas, as, env); return (jobject) jas; } @@ -249,6 +255,10 @@ Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jde MSG_launch_application(deploymentFile); } +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() { + sg_host_energy_plugin_init(); +} + SG_END_DECL() /** Run a Java org.simgrid.msg.Process @@ -258,16 +268,14 @@ SG_END_DECL() */ static void run_jprocess(JNIEnv *env, jobject jprocess) { - xbt_assert(jprocess != nullptr, "Process not created..."); - //wait for the process to be able to begin - //TODO: Cache it + // 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()); //Execution of the "run" method. jmethodID id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "run", "()V"); - xbt_assert( (id != nullptr), "Method not found..."); + xbt_assert((id != nullptr), "Method run() not found..."); env->CallVoidMethod(jprocess, id); } @@ -275,40 +283,38 @@ static void run_jprocess(JNIEnv *env, jobject jprocess) static int java_main(int argc, char *argv[]) { JNIEnv *env = get_current_thread_env(); - simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self(); + 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); //Retrieve the methodID for the constructor - xbt_assert((class_Process != NULL), "Class not found (%s). The deployment file must use the fully qualified class name, including the package. The case is important.", argv[0]); + 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"); - xbt_assert((constructor_Process != NULL), "Constructor not found for class %s. Is there a (Host, String ,String[]) constructor in your class ?", argv[0]); + xbt_assert((constructor_Process != nullptr), "Constructor not found for class %s. Is there a (Host, String ,String[]) constructor in your class ?", argv[0]); //Retrieve the name of the process. jstring jname = env->NewStringUTF(argv[0]); //Build the arguments - jobjectArray args = (jobjectArray)env->NewObjectArray(argc - 1, - env->FindClass("java/lang/String"), - env->NewStringUTF("")); - int i; - for (i = 1; i < argc; i++) + jobjectArray args = static_cast(env->NewObjectArray(argc - 1, env->FindClass("java/lang/String"), + env->NewStringUTF(""))); + 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_get_name(MSG_host_self())); - jobject jhost = Java_org_simgrid_msg_Host_getByName(env, NULL, jhostName); + jstring jhostName = env->NewStringUTF(MSG_host_self()->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 != NULL), "Process allocation failed."); + xbt_assert((jprocess != nullptr), "Process allocation failed."); jprocess = env->NewGlobalRef(jprocess); //bind the process to the context msg_process_t process = MSG_process_self(); context->jprocess = jprocess; /* sets the PID and the PPID of the process */ - env->SetIntField(jprocess, jprocess_field_Process_pid,(jint) MSG_process_get_PID(process)); - env->SetIntField(jprocess, jprocess_field_Process_ppid, (jint) MSG_process_get_PPID(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); @@ -316,29 +322,17 @@ static int java_main(int argc, char *argv[]) } namespace simgrid { -namespace java { +namespace kernel { +namespace context { /** Run the Java org.simgrid.msg.Process */ void java_main_jprocess(jobject jprocess) { JNIEnv *env = get_current_thread_env(); - simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self(); + simgrid::kernel::context::JavaContext* context = static_cast(SIMIX_context_self()); context->jprocess = jprocess; - smx_process_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) - return; - else - run_jprocess(env, context->jprocess); -} + jprocess_bind(context->jprocess, MSG_process_self(), env); + run_jprocess(env, context->jprocess); } -} - -#include "simgrid/plugins/energy.h" -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_energyInit(void) { - sg_energy_plugin_init(); -} +}}}