/* Functions related to the java process instances. */
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
-extern "C" {
+SG_BEGIN_DECL()
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;
-jobject native_to_java_process(msg_process_t process)
+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;
}
-jobject jprocess_new_global_ref(jobject jprocess, JNIEnv * env)
+jobject jprocess_ref(jobject jprocess, JNIEnv* env)
{
return env->NewGlobalRef(jprocess);
}
-void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env)
+void jprocess_unref(jobject jprocess, JNIEnv* env)
{
env->DeleteGlobalRef(jprocess);
}
-void jprocess_join(jobject jprocess, JNIEnv * env)
-{
- msg_process_t process = jprocess_to_native_process(jprocess,env);
- simgrid::kernel::context::JavaContext* context = (simgrid::kernel::context::JavaContext*) MSG_process_get_smx_ctx(process);
- xbt_os_thread_join(context->thread,nullptr);
-}
-
-msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
+msg_process_t jprocess_to_native(jobject jprocess, JNIEnv* env)
{
return (msg_process_t)(intptr_t)env->GetLongField(jprocess, jprocess_field_Process_bind);
}
env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process);
}
-jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
-{
- return (intptr_t)env->GetLongField(jprocess, jprocess_field_Process_id);
-}
-
jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
{
jstring jname = (jstring) env->GetObjectField(jprocess, jprocess_field_Process_name);
return (jstring) env->NewGlobalRef(jname);
}
-jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env)
-{
- jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
-
- if (!id)
- return JNI_FALSE;
-
- return env->GetLongField(jprocess, id) ? JNI_TRUE : JNI_FALSE;
-}
-
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");
jprocess_field_Process_name = jxbt_get_jfield(env, jprocess_class_Process, "name", "Ljava/lang/String;");
jprocess_field_Process_bind = jxbt_get_jfield(env, jprocess_class_Process, "bind", "J");
- jprocess_field_Process_id = jxbt_get_jfield(env, jprocess_class_Process, "id", "J");
jprocess_field_Process_pid = jxbt_get_jfield(env, jprocess_class_Process, "pid", "I");
jprocess_field_Process_ppid = jxbt_get_jfield(env, jprocess_class_Process, "ppid", "I");
jprocess_field_Process_host = jxbt_get_jfield(env, jprocess_class_Process, "host", "Lorg/simgrid/msg/Host;");
jprocess_field_Process_killTime = jxbt_get_jfield(env, jprocess_class_Process, "killTime", "D");
- xbt_assert(jprocess_field_Process_id && jprocess_field_Process_name && jprocess_field_Process_pid &&
- jprocess_field_Process_ppid && jprocess_field_Process_host,
+ xbt_assert(jprocess_field_Process_name && jprocess_field_Process_pid && jprocess_field_Process_ppid &&
+ jprocess_field_Process_host,
"Native initialization of msg/Process failed. Please report that bug");
}
{
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);
+ const char* 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"));
+ jxbt_throw_null(env, xbt_strdup("Process name cannot be nullptr"));
return;
}
+ const char* name = env->GetStringUTFChars(jname, 0);
+ name = xbt_strdup(name);
/* bind/retrieve the msg host */
host = MSG_host_by_name(hostname);
}
/* create a global java process instance */
- jprocess = jprocess_new_global_ref(jprocess_arg, env);
+ 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);
-
/* 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.
+ // It would be simpler if we could use a closure.
jobject jprocess = (jobject) MSG_process_get_data(process);
simgrid::kernel::context::java_main_jprocess(jprocess);
return 0;
return (jint) MSG_process_killall((int) jresetPID);
}
-JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint PID)
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid)
{
- msg_process_t process = MSG_process_from_PID(PID);
+ msg_process_t process = MSG_process_from_PID(pid);
if (!process) {
- jxbt_throw_process_not_found(env, bprintf("PID = %d",(int) PID));
+ jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast<int>(pid)));
return nullptr;
}
- jobject jprocess = native_to_java_process(process);
+ jobject jprocess = jprocess_from_native(process);
if (!jprocess) {
jxbt_throw_jni(env, "get process failed");
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) {
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
return nullptr;
}
- jprocess = native_to_java_process(process);
+ jprocess = jprocess_from_native(process);
if (!jprocess)
jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
}
JNIEXPORT void
JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) {
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
xbt_ex_t e;
int auto_restart = jauto_restart == JNI_TRUE ? 1 : 0;
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) {
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
xbt_ex_t e;
if (!process) {
}
JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess)
{
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
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_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
return;
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobject jprocess, jobject jhost)
{
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
if (!process) {
jxbt_throw_notbound(env, "process", jprocess);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) {
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ msg_process_t process = jprocess_to_native(jprocess, env);
MSG_process_set_kill_time(process, (double)jkilltime);
}
return (jint) MSG_process_get_number();
}
-} // extern C
+SG_END_DECL()
