Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Bugfix in kademlia example
[simgrid.git] / src / jmsg_task.c
index b758464..00a065d 100644 (file)
@@ -44,19 +44,19 @@ jboolean jtask_is_valid(jobject jtask, JNIEnv * env)
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) {
-       jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm");
-       jclass jtask_class_Task = (*env)->FindClass(env, "org/simgrid/msg/Task");
-
-       jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
-       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_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."));
-       }
+  jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm");
+  jclass jtask_class_Task = (*env)->FindClass(env, "org/simgrid/msg/Task");
+
+  jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
+  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_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."));
+  }
 }
 
 JNIEXPORT void JNICALL
@@ -79,7 +79,7 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env,
   if (jmessageSize < 0) {
     jxbt_throw_illegal(env,
                        bprintf("Task MessageSize (%f) cannot be negative",
-                               (double) jmessageSize));
+                       (double) jmessageSize));
     return;
   }
 
@@ -88,11 +88,10 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env,
     name = (*env)->GetStringUTFChars(env, jname, 0);
   }
 
-
   /* create the task */
   task =
       MSG_task_create(name, (double) jcomputeDuration,
-                      (double) jmessageSize, NULL);
+                     (double) jmessageSize, NULL);
   if (jname)
     (*env)->ReleaseStringUTFChars(env, jname, name);
   /* sets the task name */
@@ -104,13 +103,13 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env,
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env,
-                                               jobject jtask,
-                                               jstring jname,
-                                               jobjectArray jhosts,
-                                               jdoubleArray
-                                               jcomputeDurations_arg,
-                                               jdoubleArray
-                                               jmessageSizes_arg) {
+                                         jobject jtask,
+                                         jstring jname,
+                                         jobjectArray jhosts,
+                                         jdoubleArray
+                                         jcomputeDurations_arg,
+                                         jdoubleArray
+                                         jmessageSizes_arg) {
 
   m_task_t task;                /* the native parallel task to create           */
   const char *name;             /* the name of the task                         */
@@ -124,7 +123,6 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env,
   jobject jhost;
   int index;
 
-
   if (!jcomputeDurations_arg) {
     jxbt_throw_null(env,
                     xbt_strdup
@@ -217,13 +215,18 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env,
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
-
-  MSG_error_t rv = MSG_task_execute(task);
-
-  jxbt_check_res("MSG_task_execute()", rv,
-                 MSG_HOST_FAILURE | MSG_TASK_CANCELED,
-                 bprintf("while executing task %s",
-                         MSG_task_get_name(task)));
+  xbt_ex_t e;
+  MSG_error_t rv;
+  TRY {
+     rv = MSG_task_execute(task);
+  }
+  CATCH(e) {
+    xbt_ex_free(e);
+       return;
+  }
+  if (rv != MSG_OK) {
+       jmsg_throw_status(env, rv);
+  }
 }
 
 JNIEXPORT jstring JNICALL
@@ -363,13 +366,17 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
 
   /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */
   MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
-  rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout);
-
+  xbt_ex_t e;
+  TRY {
+    rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout);
+  }
+  CATCH(e) {
+    xbt_ex_free(e);
+  }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
   if (rv != MSG_OK) {
        jmsg_throw_status(env, rv);
-       return;
   }
 }
 
@@ -391,16 +398,19 @@ Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env, jobject jtask,
 
   /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */
   MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
-  rv = MSG_task_send_bounded(task, alias, (double) jmaxRate);
 
+  xbt_ex_t e;
+  TRY {
+    rv = MSG_task_send_bounded(task, alias, (double) jmaxRate);
+  }
+  CATCH(e) {
+    xbt_ex_free(e);
+  }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_bounded()", rv,
-                 MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT,
-                 bprintf
-                 ("while sending task %s to mailbox %s with max rate %f",
-                  MSG_task_get_name(task), alias, (double) jmaxRate));
-
+  if (rv != MSG_OK) {
+    jmsg_throw_status(env, rv);
+  }
 }
 
 
@@ -427,10 +437,12 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls,
   }
 
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
+  xbt_ex_t e;
   TRY {
        rv = MSG_task_receive_ext(task, alias, (double) jtimeout, host);
   }
-  CATCH_ANONYMOUS {
+  CATCH(e) {
+    xbt_ex_free(e);
        return NULL;
   }
   if (rv != MSG_OK) {
@@ -448,10 +460,6 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls,
 
   xbt_free(task);
 
-  jxbt_check_res("MSG_task_receive_ext()", rv,
-                 MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT,
-                 bprintf("while receiving from mailbox %s", alias));
-
   return (jobject) jtask_local;
 }
 
@@ -493,58 +501,57 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) {
 
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) {
-       jclass comm_class;
+  jclass comm_class;
 
-       const char *mailbox;
+  const char *mailbox;
 
-       m_task_t task;
+  m_task_t task;
 
-       jobject jcomm;
-       msg_comm_t comm;
+  jobject jcomm;
+  msg_comm_t comm;
 
-       comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm");
+  comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm");
 
-       if (!comm_class) return NULL;
+  if (!comm_class) return NULL;
 
-       jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
-       mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
+  jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
+  mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
 
-       task = jtask_to_native_task(jtask, env);
+  task = jtask_to_native_task(jtask, env);
 
-       if (!task) {
+  if (!task) {
     (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox);
     (*env)->DeleteLocalRef(env, jcomm);
     jxbt_throw_notbound(env, "task", jtask);
-               return NULL;
-       }
+        return NULL;
+  }
 
-  MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
-       comm = MSG_task_isend(task,mailbox);
+MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
+  comm = MSG_task_isend(task,mailbox);
 
-       (*env)->SetLongField(env, jcomm, jtask_field_Comm_bind, (jlong) (long)(comm));
-       (*env)->SetLongField(env, jcomm, jtask_field_Comm_taskBind, (jlong) (long)(NULL));
-       (*env)->SetBooleanField(env, jcomm, jtask_field_Comm_receiving, JNI_FALSE);
+  (*env)->SetLongField(env, jcomm, jtask_field_Comm_bind, (jlong) (long)(comm));
+  (*env)->SetLongField(env, jcomm, jtask_field_Comm_taskBind, (jlong) (long)(NULL));
+  (*env)->SetBooleanField(env, jcomm, jtask_field_Comm_receiving, JNI_FALSE);
 
-       (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox);
+  (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox);
 
-       return jcomm;
+  return jcomm;
 }
 
 static void msg_task_cancel_on_failed_dsend(void*t) {
-       m_task_t task = t;
-       JNIEnv *env =get_current_thread_env();
-       jobject jtask_global = MSG_task_get_data(task);
-
-       /* Destroy the global ref so that the JVM can free the stuff */
-       (*env)->DeleteGlobalRef(env, jtask_global);
-       MSG_task_set_data(task, NULL);
-       MSG_task_destroy(task);
+  m_task_t task = t;
+  JNIEnv *env =get_current_thread_env();
+  jobject jtask_global = MSG_task_get_data(task);
+
+  /* Destroy the global ref so that the JVM can free the stuff */
+  (*env)->DeleteGlobalRef(env, jtask_global);
+  MSG_task_set_data(task, NULL);
+  MSG_task_destroy(task);
 }
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask,
                                 jstring jalias) {
-
   const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -569,12 +576,14 @@ Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls,
 
   const char *alias;
   int rv;
+  xbt_ex_t e;
 
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
   TRY {
        rv = MSG_task_listen(alias);
   }
-  CATCH_ANONYMOUS {
+  CATCH(e) {
+    xbt_ex_free(e);
        return 0;
   }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
@@ -596,10 +605,13 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls,
     return -1;
   }
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
+  xbt_ex_t e;
+
   TRY {
        rv = MSG_task_listen_from_host(alias, host);
   }
-  CATCH_ANONYMOUS {
+  CATCH(e) {
+    xbt_ex_free(e);
        return 0;
   }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
@@ -614,10 +626,12 @@ Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls,
 
   int rv;
   const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
+  xbt_ex_t e;
   TRY {
        rv = MSG_task_listen_from(alias);
   }
-  CATCH_ANONYMOUS {
+  CATCH(e) {
+    xbt_ex_free(e);
        return 0;
   }
   (*env)->ReleaseStringUTFChars(env, jalias, alias);