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;
- simgrid::kernel::context::try_n_catch_stoprequest([&rv, &time]() { rv = MSG_process_sleep(time); },
- [&rv]() { rv = MSG_HOST_FAILURE; });
+ 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;
- simgrid::kernel::context::try_n_catch_stoprequest(
- [&rv, &jseconds]() { rv = MSG_process_sleep((double)jseconds); },
- [&env]() { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
-
+ 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;
}
- simgrid::kernel::context::try_n_catch_stoprequest(
- [&process]() { MSG_process_kill(process); },
- [&env]() { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
+ 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");
+ }
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobject jprocess, jobject jhost)