/* 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. */
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;
- try {
- rv = MSG_process_sleep(time);
- } catch (simgrid::kernel::context::Context::StopRequest const&) {
+ msg_error_t rv = MSG_OK;
+ if (not simgrid::kernel::context::StopRequest::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::kernel::context::StopRequest::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) {
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::kernel::context::StopRequest::try_n_catch([&process]() { MSG_process_kill(process); })) {
+ jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
}
}