X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41ac7e58ef132dea8cea9addf213671ae38229ac..a6b23c846948f7f89277f75e7c42f3942b31b8d3:/src/bindings/java/jmsg_task.c

diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c
index f6b80d650c..77aa3158e7 100644
--- a/src/bindings/java/jmsg_task.c
+++ b/src/bindings/java/jmsg_task.c
@@ -1,10 +1,10 @@
 /* Functions related to the java task instances.                            */
 
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2010, 2013-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "jmsg.h"
 
@@ -30,12 +30,12 @@ static jfieldID jtask_field_Comm_receiving;
 
 void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env)
 {
-  (*env)->SetLongField(env, jtask, jtask_field_Task_bind, (jlong) (long) (task));
+  (*env)->SetLongField(env, jtask, jtask_field_Task_bind, (intptr_t)task);
 }
 
 msg_task_t jtask_to_native_task(jobject jtask, JNIEnv * env)
 {
-  return (msg_task_t) (long) (*env)->GetLongField(env, jtask, jtask_field_Task_bind);
+  return (msg_task_t)(intptr_t)(*env)->GetLongField(env, jtask, jtask_field_Task_bind);
 }
 
 jboolean jtask_is_valid(jobject jtask, JNIEnv * env)
@@ -218,11 +218,25 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask)
   }
   msg_error_t rv;
   rv = MSG_task_execute(task);
+  if ((*env)->ExceptionOccurred(env))
+    return;
   if (rv != MSG_OK) {
     jmsg_throw_status(env, rv);
   }
 }
 
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble load)
+{
+  msg_task_t task = jtask_to_native_task(jtask, env);
+
+  if (!task) {
+    jxbt_throw_notbound(env, "task", jtask);
+    return;
+  }
+  MSG_task_set_bound(task, load);
+}
+
 JNIEXPORT jstring JNICALL
 Java_org_simgrid_msg_Task_getName(JNIEnv * env,
                                        jobject jtask) {
@@ -271,12 +285,12 @@ Java_org_simgrid_msg_Task_getSource(JNIEnv * env,
   if (host == NULL) {
   	return NULL;
   }
-  if (!MSG_host_get_data(host)) {
+  if (!xbt_lib_get_level(host, JAVA_HOST_LEVEL)) {
     jxbt_throw_jni(env, "MSG_task_get_source() failed");
     return NULL;
   }
 
-  return (jobject) MSG_host_get_data(host);
+  return (jobject) xbt_lib_get_level(host, JAVA_HOST_LEVEL);
 }
 
 JNIEXPORT jdouble JNICALL
@@ -433,6 +447,8 @@ 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);
+  if ((*env)->ExceptionOccurred(env))
+    return NULL;
   if (rv != MSG_OK) {
     jmsg_throw_status(env,rv);
     return NULL;
@@ -487,6 +503,88 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) {
 	return jcomm;
 }
 
+
+JNIEXPORT jobject JNICALL
+Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls,
+                                  jstring jalias, jdouble jtimeout,
+                                  jobject jhost, jdouble rate)
+{
+  msg_error_t rv;
+  msg_task_t *task = xbt_new(msg_task_t,1);
+  *task = NULL;
+
+  msg_host_t host = NULL;
+  jobject jtask_global, jtask_local;
+  const char *alias;
+
+  if (jhost) {
+    host = jhost_get_native(env, jhost);
+
+    if (!host) {
+      jxbt_throw_notbound(env, "host", jhost);
+      return NULL;
+    }
+  }
+
+  alias = (*env)->GetStringUTFChars(env, jalias, 0);
+  rv = MSG_task_receive_ext_bounded(task, alias, (double) jtimeout, host, (double) rate);
+  if ((*env)->ExceptionOccurred(env))
+    return NULL;
+  if (rv != MSG_OK) {
+    jmsg_throw_status(env,rv);
+    return NULL;
+  }
+  jtask_global = MSG_task_get_data(*task);
+
+  /* Convert the global ref into a local ref so that the JVM can free the stuff */
+  jtask_local = (*env)->NewLocalRef(env, jtask_global);
+  (*env)->DeleteGlobalRef(env, jtask_global);
+  MSG_task_set_data(*task, NULL);
+
+  (*env)->ReleaseStringUTFChars(env, jalias, alias);
+
+  xbt_free(task);
+
+  return (jobject) jtask_local;
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls,
+		jstring jmailbox, jdouble rate) {
+	msg_comm_t comm;
+	const char *mailbox;
+	jclass comm_class;
+	//pointer to store the task object pointer.
+	msg_task_t *task = xbt_new(msg_task_t,1);
+	*task = NULL;
+	/* There should be a cache here */
+	comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm");
+
+	if (!comm_class) {
+		jxbt_throw_native(env,bprintf("fieldID or methodID or class not found."));
+		return NULL;
+	}
+
+	jobject jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
+	if (!jcomm) {
+		jxbt_throw_native(env,bprintf("Can't create a Comm object."));
+		return NULL;
+	}
+
+	mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
+
+	comm = MSG_task_irecv_bounded(task,mailbox, (double) rate);
+
+	(*env)->SetLongField(env, jcomm, jtask_field_Comm_bind, (jlong) (long)(comm));
+	(*env)->SetLongField(env, jcomm, jtask_field_Comm_taskBind, (jlong) (long)(task));
+	(*env)->SetBooleanField(env, jcomm, jtask_field_Comm_receiving, JNI_TRUE);
+
+	(*env)->ReleaseStringUTFChars(env, jmailbox, mailbox);
+
+	return jcomm;
+}
+
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) {
   jclass comm_class;