Merge concerns - Adrien

[simgrid.git] / src / jmsg_comm.c

diff --git a/src/jmsg_comm.c b/src/jmsg_comm.c
index 374461f..976cf7e 100644 (file)
--- a/src/jmsg_comm.c
+++ b/src/jmsg_comm.c
@@ -3,13 +3,16 @@
 /* Copyright (c) 2012. The SimGrid Team. All rights reserved.                   */
 #include "jmsg_comm.h"
 #include "jxbt_utilities.h"
+#include "jmsg.h"
+
 #include <msg/msg.h>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
-static jfieldID jtask_field_Comm_task;
 static jfieldID jcomm_field_Comm_bind;
-static jfieldID jcomm_field_Comm_taskBind;
+static jfieldID jcomm_field_Comm_finished;
 static jfieldID jcomm_field_Comm_receiving;
+static jfieldID jtask_field_Comm_task;
+static jfieldID jcomm_field_Comm_taskBind;
 
 void jcomm_bind_task(JNIEnv *env, jobject jcomm) {
        msg_comm_t comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
@@ -35,40 +38,31 @@ void jcomm_bind_task(JNIEnv *env, jobject jcomm) {
        }
 
 }
-void jcomm_throw(JNIEnv *env, MSG_error_t status) {
-       switch (status) {
-               case MSG_TIMEOUT:
-                       jxbt_throw_time_out_failure(env,NULL);
-               break;
-               case MSG_TRANSFER_FAILURE:
-                       jxbt_throw_transfer_failure(env,NULL);
-               break;
-               case MSG_HOST_FAILURE:
-                       jxbt_throw_host_failure(env,NULL);
-               break;
-               default:
-                       jxbt_throw_native(env,bprintf("communication failed"));
-       }
-}
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) {
        jclass jfield_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm");
-       jcomm_field_Comm_bind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "bind", "J");
-       jcomm_field_Comm_taskBind  = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "taskBind", "J");
-       jcomm_field_Comm_receiving = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "receiving", "Z");
+       if (!jfield_class_Comm) {
+               jxbt_throw_native(env,bprintf("Can't find the org/simgrid/msg/Comm class."));
+               return;
+       }
+       jcomm_field_Comm_bind = jxbt_get_jfield(env, jfield_class_Comm, "bind", "J");
+       jcomm_field_Comm_taskBind  = jxbt_get_jfield(env, jfield_class_Comm, "taskBind", "J");
+       jcomm_field_Comm_receiving = jxbt_get_jfield(env, jfield_class_Comm, "receiving", "Z");
        jtask_field_Comm_task = jxbt_get_jfield(env, jfield_class_Comm, "task", "Lorg/simgrid/msg/Task;");
+       jcomm_field_Comm_finished = jxbt_get_jfield(env, jfield_class_Comm, "finished", "Z");
+       if (!jcomm_field_Comm_bind || !jcomm_field_Comm_taskBind || !jcomm_field_Comm_receiving || !jtask_field_Comm_task || !jcomm_field_Comm_finished) {
+       jxbt_throw_native(env,bprintf("Can't find some fields in Java class."));
+       }
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Comm_unbind(JNIEnv *env, jobject jcomm) {
+Java_org_simgrid_msg_Comm_destroy(JNIEnv *env, jobject jcomm) {
        msg_comm_t comm;
        m_task_t *task_received;
 
        task_received = (m_task_t*)  (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_taskBind);
-       if (task_received != NULL) {
-               xbt_free(task_received);
-       }
+       xbt_free(task_received);
 
        comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
        MSG_comm_destroy(comm);
@@ -79,25 +73,36 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) {
        msg_comm_t comm;
        comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
 
+       jboolean finished = (*env)->GetBooleanField(env, jcomm, jcomm_field_Comm_finished);
+       if (finished == JNI_TRUE) {
+               return JNI_TRUE;
+       }
+
        if (!comm) {
                jxbt_throw_native(env,bprintf("comm is null"));
                return JNI_FALSE;
        }
-       if (MSG_comm_test(comm)) {
-               MSG_error_t status = MSG_comm_get_status(comm);
-               if (status == MSG_OK) {
-                       jcomm_bind_task(env,jcomm);
-                       return JNI_TRUE;
+       TRY {
+               if (MSG_comm_test(comm)) {
+                       MSG_error_t status = MSG_comm_get_status(comm);
+                       if (status == MSG_OK) {
+                               jcomm_bind_task(env,jcomm);
+                               return JNI_TRUE;
+                       }
+                       else {
+                               //send the correct exception
+                               jmsg_throw_status(env,status);
+                               return JNI_FALSE;
+                       }
                }
                else {
-                       //send the correct exception
-                       jcomm_throw(env,status);
                        return JNI_FALSE;
                }
        }
-       else {
-               return JNI_FALSE;
+       CATCH_ANONYMOUS {
+
        }
+       return JNI_FALSE;
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout) {
@@ -107,13 +112,25 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim
                return;
        }
 
-       MSG_error_t status = MSG_comm_wait(comm,(double)timeout);
+       jboolean finished = (*env)->GetBooleanField(env, jcomm, jcomm_field_Comm_finished);
+       if (finished == JNI_TRUE) {
+               return;
+       }
+
+       MSG_error_t status;
+       TRY {
+               status = MSG_comm_wait(comm,(double)timeout);
+       }
+       CATCH_ANONYMOUS {
+               return;
+       }
+       (*env)->SetBooleanField(env, jcomm, jcomm_field_Comm_finished, JNI_TRUE);
        if (status == MSG_OK) {
                jcomm_bind_task(env,jcomm);
                return;
        }
        else {
-               jcomm_throw(env,status);
+               jmsg_throw_status(env,status);
        }