X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6778416c2ce4535d1542c59429af4fa4b3ede90b..60037b3f9ba9d856ccebf7a2211b51b82f4a557a:/src/bindings/java/jmsg_process.cpp diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 2c392a7587..3d941176ae 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -1,18 +1,17 @@ /* Functions related to the java process instances. */ -/* Copyright (c) 2007-2018. 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 "JavaContext.hpp" #include "jmsg.hpp" #include "jmsg_host.h" #include "jxbt_utilities.hpp" +#include "simgrid/Exception.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); @@ -26,8 +25,8 @@ jfieldID jprocess_field_Process_ppid; jobject jprocess_from_native(msg_process_t process) { simgrid::kernel::context::JavaContext* context = - (simgrid::kernel::context::JavaContext*)process->get_impl()->context_; - return context->jprocess; + static_cast(process->get_impl()->context_.get()); + return context->jprocess_; } jobject jprocess_ref(jobject jprocess, JNIEnv* env) @@ -73,21 +72,23 @@ 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::kernel::actor::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) @@ -187,9 +188,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject process->resume(); } -JNIEXPORT void -JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { - +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); if (not process) { jxbt_throw_notbound(env, "process", jprocess); @@ -226,19 +227,23 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env 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"); - - 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) { @@ -255,12 +260,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"); } } @@ -281,7 +282,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobjec } /* change the host of the process */ - process->migrate(host); + process->set_host(host); /* change the host java side */ env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);