From a019fe742c6fe315ef4b56b7833431219722a012 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 20 Mar 2017 22:32:17 +0100 Subject: [PATCH 1/1] deperlify the Java process creation: no need to pass the hostname where we can use the host --- src/bindings/java/jmsg_process.cpp | 15 ++++----------- src/bindings/java/org/simgrid/msg/Process.java | 11 ++++++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index e838a687bb..b27966d138 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -72,11 +72,10 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jcla "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 */ - msg_host_t host; /* Where that process lives */ /* get the name of the java process */ @@ -88,13 +87,11 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv * env, jobject const char* name = env->GetStringUTFChars(jname, 0); /* bind/retrieve the msg host */ - const char* hostname = env->GetStringUTFChars((jstring)jhostname, 0); - host = MSG_host_by_name(hostname); - if (!(host)) { /* not bound */ - jxbt_throw_host_not_found(env, hostname); + msg_host_t host = jhost_get_native(env, jhost); + if (!host) { + jxbt_throw_notbound(env, "host", jhost); return; } - env->ReleaseStringUTFChars((jstring)jhostname, hostname); /* create a global java process instance */ jprocess = jprocess_ref(jprocess_arg, env); @@ -119,10 +116,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv * env, jobject /* 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 jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, jint jresetPID) diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java index f26fda439e..15cd7e5854 100644 --- a/src/bindings/java/org/simgrid/msg/Process.java +++ b/src/bindings/java/org/simgrid/msg/Process.java @@ -157,10 +157,11 @@ public abstract class Process implements Runnable { this.killTime = killTime; } /** - * The natively implemented method to create an MSG process. - * @param hostName A valid (bound) host where create the process. + * The native method to create an MSG process. + * @param host where to create the process. */ - protected native void create(String hostName) throws HostNotFoundException; + protected native void create(Host host); + /** * This method kills all running process of the simulation. * @@ -299,8 +300,8 @@ public abstract class Process implements Runnable { * @throws HostNotFoundException */ public final void start() throws HostNotFoundException { - if (bind != 0) - create(host.getName()); + if (bind == 0) + create(host); } /** This method runs the process. It calls the method function that you must overwrite. */ -- 2.20.1