#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"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
-SG_BEGIN_DECL()
+extern "C" {
jfieldID jprocess_field_Process_bind;
jfieldID jprocess_field_Process_host;
jfieldID jprocess_field_Process_killTime;
-// jfieldID jprocess_field_Process_id;
jfieldID jprocess_field_Process_name;
jfieldID jprocess_field_Process_pid;
jfieldID jprocess_field_Process_ppid;
env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process);
}
-jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
-{
- jstring jname = (jstring) env->GetObjectField(jprocess, jprocess_field_Process_name);
- return (jstring) env->NewGlobalRef(jname);
-}
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) {
jclass jprocess_class_Process = env->FindClass("org/simgrid/msg/Process");
xbt_assert(jprocess_class_Process, "Native initialization of msg/Process failed. Please report that bug");
"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;
- }
-
- /* bind/retrieve the msg host */
- host = MSG_host_by_name(hostname);
-
- if (!(host)) { /* not bound */
- jxbt_throw_host_not_found(env, hostname);
- return;
- }
-
/* 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");
- return;
- }
-
- /* build the C name of the process */
- name = env->GetStringUTFChars(jname, 0);
- name = xbt_strdup(name);
+ jobject jprocess = jprocess_ref(jprocess_arg, env);
- /* 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);
+ 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);
+
/* 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);
+ /* Retrieve the kill time from the process */
+ jdouble jkill = env->GetDoubleField(jprocess, jprocess_field_Process_killTime);
+ MSG_process_set_kill_time(process, (double)jkill);
/* 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);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_daemonize(JNIEnv* env, jobject jprocess)
+{
+ msg_process_t process = jprocess_to_native(jprocess, env);
+
+ if (not process) {
+ jxbt_throw_notbound(env, "process", jprocess);
+ return;
+ }
+
+ MSG_process_daemonize(process);
}
JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, jint jresetPID)
{
msg_process_t process = MSG_process_from_PID(pid);
- if (!process) {
- jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast<int>(pid)));
+ if (not process) {
+ jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast<int>(pid)));
return nullptr;
}
jobject jprocess = jprocess_from_native(process);
- 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)
+{
+ msg_process_t process = jprocess_to_native(jprocess, env);
+ return MSG_process_get_PID(process);
+}
+
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) {
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
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) {
+ 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(MSG_process_self());
+ if (not jprocess)
jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
return jprocess;
{
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
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"));
+ jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, "unexpected error , please report this bug");
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess)
{
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
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"));
+ msg_error_t res = MSG_process_resume(process);
+ jxbt_check_res("MSG_process_resume()", res, MSG_OK, "unexpected error , please report this bug");
}
+
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) {
+ msg_process_t process = jprocess_to_native(jprocess, env);
+ if (not process) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- try {
- MSG_process_auto_restart_set(process,auto_restart);
- }
- catch (xbt_ex& e) {
- // Nothing to do
- }
+ MSG_process_auto_restart_set(process, (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;
- if (!process) {
+ if (not process) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- try {
- MSG_process_restart(process);
- }
- catch (xbt_ex& e) {
- // Nothing to do
- }
-
+ MSG_process_restart(process);
}
+
JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess)
{
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
jxbt_throw_notbound(env, "process", jprocess);
return 0;
}
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);
+ jxbt_throw_host_failure(env, "");
}
}
{
/* get the native instances from the java ones */
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
-
try {
MSG_process_kill(process);
} catch (xbt_ex& ex) {
- XBT_VERB("This process just killed itself.");
+ 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.");
}
}
{
msg_process_t process = jprocess_to_native(jprocess, env);
- if (!process) {
+ if (not process) {
jxbt_throw_notbound(env, "process", jprocess);
return;
}
msg_host_t host = jhost_get_native(env, jhost);
- if (!host) {
+ if (not host) {
jxbt_throw_notbound(env, "host", jhost);
return;
}
JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) {
return (jint) MSG_process_get_number();
}
-
-SG_END_DECL()
+}
