Merge concerns - Adrien

[simgrid.git] / src / jmsg_comm.c

diff --git a/src/jmsg_comm.c b/src/jmsg_comm.c
index 4a394cd..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,21 +38,6 @@ 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) {
@@ -62,13 +50,14 @@ Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) {
        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;");
-       if (!jcomm_field_Comm_bind || !jcomm_field_Comm_taskBind || !jcomm_field_Comm_receiving || !jtask_field_Comm_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;
 
@@ -84,6 +73,11 @@ 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;
@@ -97,7 +91,7 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) {
                        }
                        else {
                                //send the correct exception
-                               jcomm_throw(env,status);
+                               jmsg_throw_status(env,status);
                                return JNI_FALSE;
                        }
                }
@@ -117,6 +111,12 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim
                jxbt_throw_native(env,bprintf("comm is null"));
                return;
        }
+
+       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);
@@ -124,12 +124,13 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim
        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);
        }