/* Functions related to the java process instances. */
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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 "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"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
-
-SG_BEGIN_DECL()
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
jfieldID jprocess_field_Process_bind;
jfieldID jprocess_field_Process_host;
jfieldID jprocess_field_Process_pid;
jfieldID jprocess_field_Process_ppid;
-jobject jprocess_from_native(msg_process_t process)
+jobject jprocess_from_native(const_sg_actor_t actor)
{
- simgrid::kernel::context::JavaContext* context = (simgrid::kernel::context::JavaContext*) MSG_process_get_smx_ctx(process);
- return context->jprocess;
+ const simgrid::kernel::context::JavaContext* context =
+ static_cast<simgrid::kernel::context::JavaContext*>(actor->get_impl()->context_.get());
+ return context->jprocess_;
}
jobject jprocess_ref(jobject jprocess, JNIEnv* env)
env->DeleteGlobalRef(jprocess);
}
-msg_process_t jprocess_to_native(jobject jprocess, JNIEnv* env)
-{
- return (msg_process_t)(intptr_t)env->GetLongField(jprocess, jprocess_field_Process_bind);
-}
-
-void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env)
+sg_actor_t jprocess_to_native(jobject jprocess, JNIEnv* env)
{
- env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process);
+ return (sg_actor_t)(intptr_t)env->GetLongField(jprocess, jprocess_field_Process_bind);
}
-jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
+void jprocess_bind(jobject jprocess, const_sg_actor_t actor, JNIEnv* env)
{
- jstring jname = (jstring) env->GetObjectField(jprocess, jprocess_field_Process_name);
- return (jstring) env->NewGlobalRef(jname);
+ env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)actor);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) {
"Native initialization of msg/Process failed. Please report that bug");
}
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv * env, jobject jprocess_arg, jobject jhostname)
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject jprocess_arg, jobject jhost)
{
- jobject jprocess; /* the global reference to the java process instance */
- jstring jname; /* the name of the java process instance */
- const char *name; /* the C name of the process */
- const char *hostname;
- msg_process_t process; /* the native process to create */
- msg_host_t host; /* Where that process lives */
-
- hostname = env->GetStringUTFChars((jstring) jhostname, 0);
-
- /* get the name of the java process */
- jname = jprocess_get_name(jprocess_arg, env);
- if (!jname) {
- jxbt_throw_null(env,
- xbt_strdup("Internal error: Process name cannot be nullptr"));
- return;
- }
+ /* create a global java process instance */
+ jobject jprocess = jprocess_ref(jprocess_arg, env);
- /* bind/retrieve the msg host */
- host = MSG_host_by_name(hostname);
+ /* Actually build the MSG process */
+ jstring jname = (jstring)env->GetObjectField(jprocess, jprocess_field_Process_name);
+ const char* name = env->GetStringUTFChars(jname, 0);
+ auto actor_code = [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, actor_code, host, self] {
+ return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(actor_code), nullptr, host, nullptr,
+ self)
+ .get();
+ });
+ sg_actor_yield();
+
+ env->ReleaseStringUTFChars(jname, name);
+
+ /* Retrieve the kill time from the actor */
+ actor->ciface()->set_kill_time((double)env->GetDoubleField(jprocess, jprocess_field_Process_killTime));
+
+ /* sets the PID and the PPID of the actor */
+ env->SetIntField(jprocess, jprocess_field_Process_pid, (jint)actor->ciface()->get_pid());
+ env->SetIntField(jprocess, jprocess_field_Process_ppid, (jint)actor->ciface()->get_ppid());
+}
- if (!(host)) { /* not bound */
- jxbt_throw_host_not_found(env, hostname);
- return;
- }
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_daemonize(JNIEnv* env, jobject jprocess)
+{
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- /* create a global java process instance */
- jprocess = jprocess_ref(jprocess_arg, env);
- if (!jprocess) {
- jxbt_throw_jni(env, "Can't get a global ref to the java process");
+ if (not actor) {
+ jxbt_throw_notbound(env, "process", jprocess);
return;
}
- /* build the C name of the process */
- name = env->GetStringUTFChars(jname, 0);
- name = xbt_strdup(name);
-
- /* Retrieve the kill time from the process */
- jdouble jkill = env->GetDoubleField(jprocess, jprocess_field_Process_killTime);
- /* Actually build the MSG process */
- process = MSG_process_create_with_environment(name, [](int argc, char** argv) -> int {
- smx_actor_t process = SIMIX_process_self();
- // This is the jprocess passed as environment.
- // It would be simplet if we could use a closure.
- jobject jprocess = (jobject) MSG_process_get_data(process);
- simgrid::kernel::context::java_main_jprocess(jprocess);
- return 0;
- }, jprocess,
- host,
- /*argc, argv, properties*/
- 0, nullptr, nullptr);
- MSG_process_set_kill_time(process, (double)jkill);
- /* bind the java process instance to the native process */
- jprocess_bind(jprocess, process, env);
-
- /* release our reference to the process name (variable name becomes invalid) */
- //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING
- //env->ReleaseStringUTFChars(jname, name);
- env->ReleaseStringUTFChars((jstring) jhostname, hostname);
-
- /* 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));
- /* sets the Host of the process */
- jobject jhost = Java_org_simgrid_msg_Host_getByName(env,nullptr, (jstring)jhostname);
-
- env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);
+ actor->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);
+ sg_actor_kill_all();
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid)
{
- msg_process_t process = MSG_process_from_PID(pid);
+ auto const* actor = sg_actor_by_PID(pid);
- if (!process) {
- jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast<int>(pid)));
+ if (not actor) {
+ jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast<int>(pid)));
return nullptr;
}
- jobject jprocess = jprocess_from_native(process);
+ jobject jprocess = jprocess_from_native(actor);
- if (!jprocess) {
+ if (not jprocess) {
jxbt_throw_jni(env, "get process failed");
return nullptr;
}
return jprocess;
}
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_nativeGetPID(JNIEnv* env, jobject jprocess)
+{
+ const_sg_actor_t actor = jprocess_to_native(jprocess, env);
+ return sg_actor_get_PID(actor);
+}
+
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) {
- msg_process_t process = jprocess_to_native(jprocess, env);
+ const_sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return nullptr;
}
const char *name = env->GetStringUTFChars((jstring)jname, 0);
- const char *property = MSG_process_get_property_value(process, name);
- if (!property) {
+ const char* property = actor->get_property(name);
+ if (not property)
return nullptr;
- }
jobject jproperty = env->NewStringUTF(property);
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls)
{
- msg_process_t process = MSG_process_self();
- jobject jprocess;
-
- if (!process) {
- jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed"));
- return nullptr;
- }
-
- jprocess = jprocess_from_native(process);
-
- if (!jprocess)
+ jobject jprocess = jprocess_from_native(sg_actor_self());
+ if (not jprocess)
jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
return jprocess;
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native(jprocess, env);
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
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 */
+ actor->suspend();
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native(jprocess, env);
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- /* try to resume the process */
- msg_error_t rv = MSG_process_resume(process);
-
- jxbt_check_res("MSG_process_resume()", rv, MSG_OK, bprintf("unexpected error , please report this bug"));
+ /* resume the process */
+ actor->resume();
}
-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);
- xbt_ex_t e;
-
- int auto_restart = jauto_restart == JNI_TRUE ? 1 : 0;
- if (!process) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart(JNIEnv* env, jobject jprocess,
+ jboolean jauto_restart)
+{
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- try {
- MSG_process_auto_restart_set(process,auto_restart);
- }
- catch (xbt_ex& e) {
- // Nothing to do
- }
+ actor->set_auto_restart(jauto_restart == JNI_TRUE);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) {
- msg_process_t process = jprocess_to_native(jprocess, env);
- xbt_ex_t e;
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- try {
- MSG_process_restart(process);
- }
- catch (xbt_ex& e) {
- // Nothing to do
- }
-
+ actor->restart();
}
+
JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native(jprocess, env);
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return 0;
}
- /* true is the process is suspended, false otherwise */
- return (jboolean) MSG_process_is_suspended(process);
+ /* true is the actor is suspended, false otherwise */
+ return (jboolean)actor->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,nullptr);
+ 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) {
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject jprocess)
{
/* get the native instances from the java ones */
- msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
-
- try {
- MSG_process_kill(process);
- } catch (xbt_ex& ex) {
- XBT_VERB("This process just killed itself.");
+ if (not simgrid::ForcefulKillException::try_n_catch([&actor]() { actor->kill(); })) {
+ 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)
{
- msg_process_t process = jprocess_to_native(jprocess, env);
+ sg_actor_t actor = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not actor) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- msg_host_t host = jhost_get_native(env, jhost);
+ sg_host_t host = jhost_get_native(env, jhost);
- if (!host) {
+ if (not host) {
jxbt_throw_notbound(env, "host", jhost);
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 actor */
+ actor->set_host(host);
+
/* change the host java side */
env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_yield(JNIEnv* env, jclass cls)
{
- MSG_process_yield();
+ simgrid::s4u::this_actor::yield();
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) {
- msg_process_t process = jprocess_to_native(jprocess, env);
- MSG_process_set_kill_time(process, (double)jkilltime);
+ jprocess_to_native(jprocess, env)->set_kill_time((double)jkilltime);
}
JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) {
- return (jint) MSG_process_get_number();
+ return (jint)sg_actor_count();
}
-
-SG_END_DECL()