Add dsendBounded + sendBounded with timeout

[simgrid.git] / src / jmsg_task.c

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index 67a87de..d7a9fea 100644 (file)
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -381,27 +381,28 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env, jobject jtask,
-                                           jstring jalias,
-                                           jdouble jmaxRate)
+Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask,
+                                    jstring jalias,
+                                    jdouble jtimeout,
+                                   jdouble maxrate)
 {
-  msg_task_t task = jtask_to_native_task(jtask, env);
   msg_error_t rv;
-  const char *alias;
+  const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
+
+  msg_task_t task = jtask_to_native_task(jtask, env);
+
 
   if (!task) {
+    (*env)->ReleaseStringUTFChars(env, jalias, alias);
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
 
-  alias = (*env)->GetStringUTFChars(env, jalias, 0);
-
   /* 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));
-
   xbt_ex_t e;
   TRY {
-    rv = MSG_task_send_bounded(task, alias, (double) jmaxRate);
+    rv = MSG_task_send_with_timeout_bounded(task, alias, (double) jtimeout, (double) maxrate);
   }
   CATCH(e) {
     xbt_ex_free(e);
@@ -409,11 +410,10 @@ Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env, jobject jtask,
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
   if (rv != MSG_OK) {
-    jmsg_throw_status(env, rv);
+       jmsg_throw_status(env, rv);
   }
 }
 
-
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls,
                                        jstring jalias, jdouble jtimeout,
@@ -538,6 +538,47 @@ MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
   return jcomm;
 }
 
+JNIEXPORT jobject JNICALL
+Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, jdouble maxrate) {
+  jclass comm_class;
+
+  const char *mailbox;
+
+  msg_task_t task;
+
+  jobject jcomm;
+  msg_comm_t comm;
+
+  comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm");
+
+  if (!comm_class) return NULL;
+
+  jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
+  mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
+
+  task = jtask_to_native_task(jtask, env);
+
+  if (!task) {
+    (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox);
+    (*env)->DeleteLocalRef(env, jcomm);
+    jxbt_throw_notbound(env, "task", jtask);
+        return NULL;
+  }
+
+MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
+  comm = MSG_task_isend_bounded(task,mailbox,maxrate);
+
+  (*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);
+
+  return jcomm;
+}
+
+
+
 static void msg_task_cancel_on_failed_dsend(void*t) {
   msg_task_t task = t;
   JNIEnv *env =get_current_thread_env();
@@ -570,6 +611,29 @@ Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask,
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 }
 
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask,
+                                jstring jalias, jdouble maxrate) {
+  const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
+
+  msg_task_t task = jtask_to_native_task(jtask, env);
+
+
+  if (!task) {
+    (*env)->ReleaseStringUTFChars(env, jalias, alias);
+    jxbt_throw_notbound(env, "task", jtask);
+    return;
+  }
+
+  /* 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));
+  MSG_task_dsend_bounded(task, alias, msg_task_cancel_on_failed_dsend,(double)maxrate);
+
+  (*env)->ReleaseStringUTFChars(env, jalias, alias);
+}
+
+
+
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls,
                                                                                                           jstring jalias) {