From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 29 Feb 2016 14:16:29 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~623
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f601563f0c0e08906cdc9f5560d0d8211d46a090?hp=1837819a613b40836d1da43193d34f26ae094e86

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index 7c6cb4ac47..d86e9582de 100644
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -223,7 +223,7 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask)
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble load)
+Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble bound)
 {
   msg_task_t task = jtask_to_native_task(jtask, env);
 
@@ -231,7 +231,7 @@ Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble load)
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
-  MSG_task_set_bound(task, load);
+  MSG_task_set_bound(task, bound);
 }
 
 JNIEXPORT jstring JNICALL
diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java
index 6410bbfcd9..ac034b6c0a 100644
--- a/src/bindings/java/org/simgrid/msg/Task.java
+++ b/src/bindings/java/org/simgrid/msg/Task.java
@@ -160,8 +160,8 @@ public class Task {
 	 */
 	public native void execute() throws HostFailureException,TaskCancelledException;
 
-	/** Bound a computation to a certain load */
-	public native void setBound(double load); 
+	/** Changes the maximum CPU utilization of a computation task. Unit is flops/s. */
+	public native void setBound(double bound); 
 
 	/** Cancels a task. */ 
 	public native void cancel();