Add a cache on Host.name. Add a cache on some jfieldID/jmethodID on Host/Process

[simgrid.git] / src / jmsg_task.c

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index 72a6480..bd1ea49 100644 (file)
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -18,7 +18,7 @@
 #include <msg/msg.h>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
-static jmethodID jtask_field_Comm_constructor;
+static jmethodID jtask_method_Comm_constructor;
 
 static jfieldID jtask_field_Task_bind;
 static jfieldID jtask_field_Comm_bind;
@@ -44,14 +44,14 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) {
        jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm");
 
-       jtask_field_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
+       jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
        //FIXME: Don't use jxbt_get_sfield directly, it is slower.
        jtask_field_Task_bind = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J");
        jtask_field_Comm_bind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "bind", "J");
        jtask_field_Comm_taskBind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "taskBind", "J");
        jtask_field_Comm_receiving = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "receiving", "Z");
        if (!jtask_field_Task_bind || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind ||
-                 !jtask_field_Comm_receiving || !jtask_field_Comm_constructor) {
+                 !jtask_field_Comm_receiving || !jtask_method_Comm_constructor) {
                        jxbt_throw_native(env,bprintf("Can't find some fields in Java class."));
                  }
 }
@@ -247,6 +247,9 @@ Java_org_simgrid_msg_Task_getSender(JNIEnv * env,
   }
 
   process = MSG_task_get_sender(task);
+  if (process == NULL) {
+       return NULL;
+  }
   return (jobject) native_to_java_process(process);
 }
 
@@ -263,7 +266,9 @@ Java_org_simgrid_msg_Task_getSource(JNIEnv * env,
   }
 
   host = MSG_task_get_source(task);
-
+  if (host == NULL) {
+       return NULL;
+  }
   if (!MSG_host_get_data(host)) {
     jxbt_throw_jni(env, "MSG_task_get_source() failed");
     return NULL;
@@ -441,7 +446,7 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) {
                return NULL;
        }
 
-       jobject jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor);
+       jobject jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
        if (!jcomm) {
                jxbt_throw_native(env,bprintf("Can't create a Comm object."));
                return NULL;
@@ -475,7 +480,7 @@ Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) {
 
        if (!comm_class) return NULL;
 
-       jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor);
+       jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
        mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
 
        task = jtask_to_native_task(jtask, env);