Fix the handling of errors in Task.send

[simgrid.git] / src / jmsg_task.c

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index 844ed84..9eb973c 100644 (file)
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -16,6 +16,7 @@
 #include "jxbt_utilities.h"
 
 #include <msg/msg.h>
+
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 static jmethodID jtask_method_Comm_constructor;
@@ -47,12 +48,11 @@ Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) {
        jclass jtask_class_Task = (*env)->FindClass(env, "org/simgrid/msg/Task");
 
        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_Task_bind = jxbt_get_jfield(env, jtask_class_Task, "bind", "J");
        jtask_field_Task_name = jxbt_get_jfield(env, jtask_class_Task, "name", "Ljava/lang/String;");
-       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");
+       jtask_field_Comm_bind = jxbt_get_jfield(env, jtask_class_Comm, "bind", "J");
+       jtask_field_Comm_taskBind = jxbt_get_jfield(env, jtask_class_Comm, "taskBind", "J");
+       jtask_field_Comm_receiving = jxbt_get_jfield(env, jtask_class_Comm, "receiving", "Z");
        if (!jtask_field_Task_bind || !jtask_class_Task || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind ||
                  !jtask_field_Comm_receiving || !jtask_method_Comm_constructor) {
                        jxbt_throw_native(env,bprintf("Can't find some fields in Java class."));
@@ -306,7 +306,21 @@ Java_org_simgrid_msg_Task_getRemainingDuration(JNIEnv * env, jobject jtask)
   }
   return (jdouble) MSG_task_get_remaining_computation(ptask);
 }
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) {
+       m_task_t task = jtask_to_native_task(jtask, env);
+
+       if (!task) {
+               jxbt_throw_notbound(env, "task", jtask);
+               return;
+       }
+       const char *name = (*env)->GetStringUTFChars(env, jname, 0);
 
+       (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname);
+       MSG_task_set_name(task, name);
+
+       (*env)->ReleaseStringUTFChars(env, jname, name);
+}
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_setPriority(JNIEnv * env,
                                            jobject jtask, jdouble priority)
@@ -320,6 +334,17 @@ Java_org_simgrid_msg_Task_setPriority(JNIEnv * env,
   MSG_task_set_priority(task, (double) priority);
 }
 JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Task_setComputeDuration
+               (JNIEnv *env, jobject jtask, jdouble computationAmount) {
+       m_task_t task = jtask_to_native_task(jtask, env);
+
+       if (!task) {
+    jxbt_throw_notbound(env, "task", jtask);
+    return;
+       }
+       MSG_task_set_compute_duration(task, (double) computationAmount);
+}
+JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
                                     jstring jalias,
                                     jdouble jtimeout)
@@ -342,10 +367,10 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_with_timeout()", rv,
-                 MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT,
-                 bprintf("while sending task %s to mailbox %s",
-                         MSG_task_get_name(task), alias));
+  if (rv != MSG_OK) {
+       jmsg_throw_status(env, rv);
+       return;
+  }
 }
 
 JNIEXPORT void JNICALL
@@ -400,22 +425,14 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls,
   }
 
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
-
-  rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host);
+  TRY {
+       rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host);
+  }
+  CATCH_ANONYMOUS {
+       return NULL;
+  }
   if (rv != MSG_OK) {
-       switch (rv) {
-               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("receive failed"));
-       }
+       jmsg_throw_status(env,rv);
        return NULL;
   }
   jtask_global = MSG_task_get_data(task);
@@ -550,9 +567,12 @@ Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls,
   int rv;
 
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
-
-  rv = MSG_task_listen(alias);
-
+  TRY {
+       rv = MSG_task_listen(alias);
+  }
+  CATCH_ANONYMOUS {
+       return 0;
+  }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
   return (jboolean) rv;
@@ -572,9 +592,12 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls,
     return -1;
   }
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
-
-  rv = MSG_task_listen_from_host(alias, host);
-
+  TRY {
+       rv = MSG_task_listen_from_host(alias, host);
+  }
+  CATCH_ANONYMOUS {
+       return 0;
+  }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
   return (jint) rv;
@@ -587,9 +610,12 @@ Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls,
 
   int rv;
   const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
-
-  rv = MSG_task_listen_from(alias);
-
+  TRY {
+       rv = MSG_task_listen_from(alias);
+  }
+  CATCH_ANONYMOUS {
+       return 0;
+  }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
   return (jint) rv;