From 82b9a1db9168e46fb62edc6fa0b3f6fb09b2a7fd Mon Sep 17 00:00:00 2001
From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Mon, 14 May 2012 17:12:25 +0200
Subject: [PATCH 1/1] Removed jprocess_start (useless now), cached ids in
 jmsg_process

---
 src/jmsg_process.c | 54 +++++++++++-----------------------------------
 src/jmsg_process.h | 14 ------------
 2 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 319294498b..b7d7a3bf23 100644
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -14,7 +14,10 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
+static jfieldID jprocess_field_Process_bind;
+static jfieldID jprocess_field_Process_name;
 static jfieldID jprocess_field_Process_host;
+static jfieldID jprocess_field_Process_id;
 static jfieldID jprocess_field_Process_pid;
 static jfieldID jprocess_field_Process_ppid;
 
@@ -40,58 +43,24 @@ void jprocess_join(jobject jprocess, JNIEnv * env)
 	xbt_os_thread_join(context->thread,NULL);
 }
 
-void jprocess_start(jobject jprocess, JNIEnv * env)
-{
-  jmethodID id =
-      jxbt_get_smethod(env, "org/simgrid/msg/Process", "start", "()V");
-
-  if (!id)
-    return;
-
-  XBT_DEBUG("jprocess_start(jproc=%p,env=%p)", jprocess, env);
-  (*env)->CallVoidMethod(env, jprocess, id);
-  XBT_DEBUG("jprocess started");
-}
-
 m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
-
-  if (!id) {
-  	XBT_INFO("Can't find bind field in Process");
-    return NULL;
-  }
-  return (m_process_t) (long) (*env)->GetLongField(env, jprocess, id);
+  return (m_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind);
 }
 
 void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
-  xbt_assert((id != NULL), "field bind not found in org/simgrid/msg/Process");
-  (*env)->SetLongField(env, jprocess, id, (jlong) (long) (process));
+  (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong) (long) (process));
 }
 
 jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "id", "J");
-
-  if (!id)
-    return 0;
-
-  return (*env)->GetLongField(env, jprocess, id);
+  return (*env)->GetLongField(env, jprocess, jprocess_field_Process_id);
 }
 
 jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "name",
-                                "Ljava/lang/String;");
-  jobject jname;
-
-  if (!id)
-    return NULL;
-
-  jname = (jstring) (*env)->GetObjectField(env, jprocess, id);
-
+  jstring jname = (jstring) (*env)->GetObjectField(env, jprocess, jprocess_field_Process_name);
   return (*env)->NewGlobalRef(env, jname);
 
 }
@@ -109,11 +78,14 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) {
 	jclass jprocess_class_Process = (*env)->FindClass(env, "org/simgrid/msg/Process");
 
-	jprocess_field_Process_pid = jxbt_get_sfield(env, "org/simgrid/msg/Process", "pid", "I");
-	jprocess_field_Process_ppid = jxbt_get_sfield(env, "org/simgrid/msg/Process", "ppid", "I");
+	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;");
 
-	if (!jprocess_class_Process || !jprocess_field_Process_pid ||
+	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."));
 	}
diff --git a/src/jmsg_process.h b/src/jmsg_process.h
index 2623910d95..ff309802e8 100644
--- a/src/jmsg_process.h
+++ b/src/jmsg_process.h
@@ -53,20 +53,6 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env);
  *
  */
 void jprocess_join(jobject jprocess, JNIEnv * env);
-
-/**
- * This function starts the specified java process.
- *
- * @param jprocess		The java process to start.
- * @param env			The env of the current thread
- *
- * @exception			If the class Process is not found the function throws 
- *						the ClassNotFoundException. If the methos start() of 
- *						this class is not found the function throws the exception 
- *						NotSuchMethodException.	
- */
-void jprocess_start(jobject jprocess, JNIEnv * env);
-
 /**
  * This function associated a native process to a java process instance.
  *
-- 
2.20.1