X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a019fe742c6fe315ef4b56b7833431219722a012..32892d0df7206a7c14ace5a13f985df1e0a9249a:/src/bindings/java/jmsg_process.cpp diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index b27966d138..f914fc859c 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -1,23 +1,20 @@ /* Functions related to the java process instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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 "jmsg_process.h" -#include "jmsg.h" -#include "jmsg_host.h" -#include "jxbt_utilities.h" #include "JavaContext.hpp" +#include "jmsg.hpp" +#include "jmsg_host.h" +#include "jxbt_utilities.hpp" +#include "simgrid/Exception.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -SG_BEGIN_DECL() - jfieldID jprocess_field_Process_bind; jfieldID jprocess_field_Process_host; jfieldID jprocess_field_Process_killTime; @@ -27,7 +24,8 @@ jfieldID jprocess_field_Process_ppid; jobject jprocess_from_native(msg_process_t process) { - simgrid::kernel::context::JavaContext* context = (simgrid::kernel::context::JavaContext*) MSG_process_get_smx_ctx(process); + simgrid::kernel::context::JavaContext* context = + (simgrid::kernel::context::JavaContext*)process->get_impl()->context_; return context->jprocess; } @@ -51,12 +49,6 @@ void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env) env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process); } -jstring jprocess_get_name(jobject jprocess, JNIEnv * env) -{ - jstring jname = (jstring) env->GetObjectField(jprocess, jprocess_field_Process_name); - return (jstring) env->NewGlobalRef(jname); -} - JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) { jclass jprocess_class_Process = env->FindClass("org/simgrid/msg/Process"); xbt_assert(jprocess_class_Process, "Native initialization of msg/Process failed. Please report that bug"); @@ -74,38 +66,17 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jcla JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject jprocess_arg, jobject jhost) { - jobject jprocess; /* the global reference to the java process instance */ - jstring jname; /* the name of the java process instance */ - - - /* get the name of the java process */ - jname = jprocess_get_name(jprocess_arg, env); - if (!jname) { - jxbt_throw_null(env, xbt_strdup("Process name cannot be nullptr")); - return; - } - const char* name = env->GetStringUTFChars(jname, 0); - - /* bind/retrieve the msg host */ - msg_host_t host = jhost_get_native(env, jhost); - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return; - } - /* create a global java process instance */ - jprocess = jprocess_ref(jprocess_arg, env); - if (!jprocess) { - jxbt_throw_jni(env, "Can't get a global ref to the java process"); - return; - } + jobject jprocess = jprocess_ref(jprocess_arg, env); /* Actually build the MSG process */ - msg_process_t process = MSG_process_create_from_stdfunc( - name, [jprocess]() -> void { simgrid::kernel::context::java_main_jprocess(jprocess); }, - /*data*/ nullptr, host, /* properties*/ nullptr); - + jstring jname = (jstring)env->GetObjectField(jprocess, jprocess_field_Process_name); + const char* name = env->GetStringUTFChars(jname, 0); + msg_process_t process = + MSG_process_create_from_stdfunc(name, [jprocess]() { simgrid::kernel::context::java_main_jprocess(jprocess); }, + /*data*/ nullptr, jhost_get_native(env, jhost), /* properties*/ nullptr); env->ReleaseStringUTFChars(jname, name); + /* bind the java process instance to the native process */ jprocess_bind(jprocess, process, env); @@ -118,23 +89,35 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject env->SetIntField(jprocess, jprocess_field_Process_ppid, (jint) MSG_process_get_PPID(process)); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, jint jresetPID) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_daemonize(JNIEnv* env, jobject jprocess) +{ + msg_process_t process = jprocess_to_native(jprocess, env); + + if (not process) { + jxbt_throw_notbound(env, "process", jprocess); + return; + } + + process->daemonize(); +} + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls) { - return (jint) MSG_process_killall((int) jresetPID); + MSG_process_killall(); } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid) { msg_process_t process = MSG_process_from_PID(pid); - if (!process) { - jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast(pid))); + if (not process) { + jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast(pid))); return nullptr; } jobject jprocess = jprocess_from_native(process); - if (!jprocess) { + if (not jprocess) { jxbt_throw_jni(env, "get process failed"); return nullptr; } @@ -142,19 +125,24 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jcl return jprocess; } +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_nativeGetPID(JNIEnv* env, jobject jprocess) +{ + msg_process_t process = jprocess_to_native(jprocess, env); + return MSG_process_get_PID(process); +} + JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) { msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return nullptr; } const char *name = env->GetStringUTFChars((jstring)jname, 0); const char *property = MSG_process_get_property_value(process, name); - if (!property) { + if (not property) return nullptr; - } jobject jproperty = env->NewStringUTF(property); @@ -165,17 +153,8 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls) { - msg_process_t process = MSG_process_self(); - jobject jprocess; - - if (!process) { - jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed")); - return nullptr; - } - - jprocess = jprocess_from_native(process); - - if (!jprocess) + jobject jprocess = jprocess_from_native(MSG_process_self()); + if (not jprocess) jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed")); return jprocess; @@ -185,79 +164,62 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobjec { msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } - /* try to suspend the process */ - msg_error_t rv = MSG_process_suspend(process); - - jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); + /* suspend the process */ + process->suspend(); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess) { msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } - /* try to resume the process */ - msg_error_t rv = MSG_process_resume(process); - - jxbt_check_res("MSG_process_resume()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); + /* resume the process */ + process->resume(); } + JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { - msg_process_t process = jprocess_to_native(jprocess, env); - xbt_ex_t e; - int auto_restart = jauto_restart == JNI_TRUE ? 1 : 0; - - if (!process) { + msg_process_t process = jprocess_to_native(jprocess, env); + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } - try { - MSG_process_auto_restart_set(process,auto_restart); - } - catch (xbt_ex& e) { - // Nothing to do - } + process->set_auto_restart(jauto_restart == JNI_TRUE); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) { msg_process_t process = jprocess_to_native(jprocess, env); - xbt_ex_t e; - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } - try { - MSG_process_restart(process); - } - catch (xbt_ex& e) { - // Nothing to do - } - + process->restart(); } + JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess) { msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return 0; } /* true is the process is suspended, false otherwise */ - return (jboolean) MSG_process_is_suspended(process); + return (jboolean)process->is_suspended(); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) @@ -268,13 +230,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cl if (rv != MSG_OK) { XBT_DEBUG("Something during the MSG_process_sleep invocation was wrong, trigger a HostFailureException"); - //jmsg_throw_status(env,rv); - - // adsein, the code above as been replaced by the code below. Indeed, according to the documentation, a sleep can only - // trigger a host_failure exception. When the sleep crashes due to a host shutdown, the exception thrown by smx_context_java.c - // is a cancelled_error, see bindings/java/smx_context_java.c, function void smx_ctx_java_stop(smx_context_t context) and src/msg/msg_gos.c - // function msg_error_t MSG_process_sleep(double nb_sec) - jxbt_throw_host_failure(env, ""); } } @@ -295,15 +250,16 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject j { /* get the native instances from the java ones */ msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } - try { MSG_process_kill(process); } catch (xbt_ex& ex) { - XBT_VERB("This process just killed itself."); + XBT_VERB("Process %s just committed a suicide", MSG_process_get_name(process)); + xbt_assert(process == MSG_process_self(), + "Killing a process should not raise an exception if it's not a suicide. Please report that bug."); } } @@ -311,24 +267,21 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobjec { msg_process_t process = jprocess_to_native(jprocess, env); - if (!process) { + if (not process) { jxbt_throw_notbound(env, "process", jprocess); return; } msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return; } - /* try to change the host of the process */ - msg_error_t rv = MSG_process_migrate(process, host); - if (rv != MSG_OK) { - jmsg_throw_status(env,rv); - return; - } + /* change the host of the process */ + process->migrate(host); + /* change the host java side */ env->SetObjectField(jprocess, jprocess_field_Process_host, jhost); } @@ -346,5 +299,3 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , j JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) { return (jint) MSG_process_get_number(); } - -SG_END_DECL()