X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d33e7a563a884247bff85406dcc589a70a162e79..15311a88748c43e1cce725bbfca20ea95e9debea:/src/bindings/java/jmsg_process.cpp diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 2676857589..758b3814e4 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,8 +24,9 @@ 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); - return context->jprocess; + simgrid::kernel::context::JavaContext* context = + (simgrid::kernel::context::JavaContext*)process->get_impl()->context_; + return context->jprocess_; } jobject jprocess_ref(jobject jprocess, JNIEnv* env) @@ -91,9 +89,21 @@ 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) @@ -101,7 +111,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jcl msg_process_t process = MSG_process_from_PID(pid); if (not process) { - jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast(pid))); + jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast(pid))); return nullptr; } @@ -115,6 +125,12 @@ 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); @@ -153,10 +169,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobjec 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) @@ -168,9 +182,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject return; } - /* try to resume the process */ - msg_error_t res = MSG_process_resume(process); - jxbt_check_res("MSG_process_resume()", res, MSG_OK, bprintf("unexpected error , please report this bug")); + /* resume the process */ + process->resume(); } JNIEXPORT void @@ -182,26 +195,20 @@ JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jproce return; } - MSG_process_auto_restart_set(process, (jauto_restart == JNI_TRUE)); + 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 (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); @@ -212,7 +219,7 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env } /* 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) @@ -223,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, ""); } } @@ -279,12 +279,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobjec 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); } @@ -302,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()