/* 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 <xbt/ex.hpp>
-
#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);
-extern "C" {
-
jfieldID jprocess_field_Process_bind;
jfieldID jprocess_field_Process_host;
jfieldID jprocess_field_Process_killTime;
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<simgrid::kernel::context::JavaContext*>(process->get_impl()->context_.get());
+ return context->jprocess_;
}
jobject jprocess_ref(jobject jprocess, JNIEnv* env)
/* 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)
process->daemonize();
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls)
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls)
{
- return (jint)MSG_process_killall();
+ MSG_process_killall();
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid)
return;
}
- process->setAutoRestart(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) {
}
/* true is the process is suspended, false otherwise */
- return (jboolean)process->isSuspended();
+ 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");
-
- 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) {
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");
}
}
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);
}
JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) {
return (jint) MSG_process_get_number();
}
-}
