/* 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. */
/* 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. */
jfieldID jprocess_field_Process_bind;
jfieldID jprocess_field_Process_host;
jfieldID jprocess_field_Process_killTime;
jfieldID jprocess_field_Process_bind;
jfieldID jprocess_field_Process_host;
jfieldID jprocess_field_Process_killTime;
jfieldID jprocess_field_Process_name;
jfieldID jprocess_field_Process_pid;
jfieldID jprocess_field_Process_ppid;
jfieldID jprocess_field_Process_name;
jfieldID jprocess_field_Process_pid;
jfieldID jprocess_field_Process_ppid;
-void jprocess_join(jobject jprocess, JNIEnv * env)
-{
- msg_process_t process = jprocess_to_native_process(jprocess,env);
- simgrid::java::JavaContext* context =
- (simgrid::java::JavaContext*) MSG_process_get_smx_ctx(process);
- xbt_os_thread_join(context->thread,NULL);
-}
-
-msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
+msg_process_t jprocess_to_native(jobject jprocess, JNIEnv* env)
- 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);
+ env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process);
-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) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) {
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_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_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");
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");
- if (!jprocess_class_Process || !jprocess_field_Process_id || !jprocess_field_Process_name || !jprocess_field_Process_pid ||
- !jprocess_field_Process_ppid || !jprocess_field_Process_host) {
- jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
- }
+ 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 */
jobject jprocess; /* the global reference to the java process instance */
jstring jname; /* the name of the java process instance */
/* get the name of the java process */
jname = jprocess_get_name(jprocess_arg, env);
if (!jname) {
/* get the name of the java process */
jname = jprocess_get_name(jprocess_arg, env);
if (!jname) {
if (!(host)) { /* not bound */
jxbt_throw_host_not_found(env, hostname);
return;
}
if (!(host)) { /* not bound */
jxbt_throw_host_not_found(env, hostname);
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);
- process = MSG_process_create_with_environment(name,
- (xbt_main_func_t) jprocess,
- /*data*/ jprocess,
- host,
- /*argc, argv, properties*/
- 0,NULL,NULL);
- MSG_process_set_kill_time(process, (double)jkill);
+ msg_process_t process = MSG_process_create_from_stdfunc(
+ name, [jprocess]() -> void { simgrid::kernel::context::java_main_jprocess(jprocess); },
+ /*data*/ nullptr, host, /* properties*/ nullptr);
+
+ env->ReleaseStringUTFChars(jname, name);
/* bind the java process instance to the native process */
jprocess_bind(jprocess, process, env);
/* 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 */
/* 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 */
-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)
-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);
+
+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 char *name = env->GetStringUTFChars((jstring)jname, 0);
const char *property = MSG_process_get_property_value(process, name);
if (!property) {
}
const char *name = env->GetStringUTFChars((jstring)jname, 0);
const char *property = MSG_process_get_property_value(process, name);
if (!property) {
{
msg_process_t process = MSG_process_self();
jobject jprocess;
if (!process) {
jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed"));
{
msg_process_t process = MSG_process_self();
jobject jprocess;
if (!process) {
jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed"));
- 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, bprintf("unexpected error , please report this bug"));
- jxbt_check_res("MSG_process_resume()", rv, MSG_OK,
- bprintf("unexpected error , please report this bug"));
+ jxbt_check_res("MSG_process_resume()", rv, MSG_OK, bprintf("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_process(jprocess, env);
+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);
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_restart
- (JNIEnv *env, jobject jprocess) {
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) {
+ msg_process_t process = jprocess_to_native(jprocess, env);
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
// 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)
// 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)
- /* get the native instances from the java ones */
- msg_process_t process = jprocess_to_native_process(jprocess, env);
+ /* get the native instances from the java ones */
+ msg_process_t process = jprocess_to_native(jprocess, env);
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
- jobject jprocess, jobject jhost)
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobject jprocess, jobject jhost)
/* change the host java side */
env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);
}
/* change the host java side */
env->SetObjectField(jprocess, jprocess_field_Process_host, jhost);
}
-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_set_kill_time(process, (double)jkilltime);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_yield(JNIEnv* env, jclass cls)
+{
+ MSG_process_yield();
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) {
- return (jint) MSG_process_get_number();
+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);