X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b81fbca63e1c91d6c0084ed124988e4bbbf6d56b..82567f27fa74ddc2b6afa8d9b682bdde15fe3f9c:/src/bindings/java/jmsg_process.cpp diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 184e259cf5..26906a4f3c 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -1,23 +1,21 @@ /* Functions related to the java process instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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" +#include "src/simix/ActorImpl.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 +25,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 = + static_cast(process->get_impl()->context_.get()); + return context->jprocess_; } jobject jprocess_ref(jobject jprocess, JNIEnv* env) @@ -74,26 +73,40 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject /* Actually build the MSG process */ 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); + simgrid::simix::ActorCode function = [jprocess]() { simgrid::kernel::context::java_main_jprocess(jprocess); }; + smx_actor_t self = SIMIX_process_self(); + sg_host_t host = jhost_get_native(env, jhost); + smx_actor_t actor = simgrid::simix::simcall([name, function, host, self] { + return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(function), nullptr, host, nullptr, self) + .get(); + }); + MSG_process_yield(); - /* bind the java process instance to the native process */ - jprocess_bind(jprocess, process, env); + env->ReleaseStringUTFChars(jname, name); /* Retrieve the kill time from the process */ - jdouble jkill = env->GetDoubleField(jprocess, jprocess_field_Process_killTime); - MSG_process_set_kill_time(process, (double)jkill); + actor->ciface()->set_kill_time((double)env->GetDoubleField(jprocess, jprocess_field_Process_killTime)); /* 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, (jint)actor->ciface()->get_pid()); + env->SetIntField(jprocess, jprocess_field_Process_ppid, (jint)actor->ciface()->get_ppid()); +} + +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 jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, jint jresetPID) +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 +114,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 +128,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 +172,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 +185,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,7 +198,7 @@ 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) { @@ -193,7 +209,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobjec return; } - MSG_process_restart(process); + process->restart(); } JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess) @@ -206,32 +222,29 @@ 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) { double time = ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000; - msg_error_t rv; - rv = MSG_process_sleep(time); + msg_error_t rv = MSG_OK; + if (not simgrid::ForcefulKillException::try_n_catch([&time]() { simgrid::s4u::this_actor::sleep_for(time); })) { + rv = MSG_HOST_FAILURE; + } 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, ""); + jmsg_throw_status(env, rv); } } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds) { - msg_error_t rv; - rv = MSG_process_sleep((double)jseconds); + msg_error_t rv = MSG_OK; + if (not simgrid::ForcefulKillException::try_n_catch( + [&jseconds]() { simgrid::s4u::this_actor::sleep_for((double)jseconds); })) { + rv = MSG_HOST_FAILURE; + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); + } if (env->ExceptionOccurred()) return; if (rv != MSG_OK) { @@ -248,12 +261,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject j jxbt_throw_notbound(env, "process", jprocess); return; } - try { - MSG_process_kill(process); - } catch (xbt_ex& ex) { - 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."); + if (not simgrid::ForcefulKillException::try_n_catch([&process]() { MSG_process_kill(process); })) { + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); } } @@ -273,12 +282,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); } @@ -296,5 +302,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()