From: Julien Gossa <julien.gossa@unistra.fr>
Date: Fri, 4 Mar 2016 17:01:55 +0000 (+0100)
Subject: VM.setBound(int load) is now VM.setBound(double bound) to meet the MSG semantics... 
X-Git-Tag: v3_13~561^2^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/76c121ea258e9b3a5f7330efcb2babc6811c9314

VM.setBound(int load) is now VM.setBound(double bound) to meet the MSG semantics. Use VM.getSpeed()*load/100 for the legacy behavior.
---

diff --git a/ChangeLog.SimGrid-java b/ChangeLog.SimGrid-java
index d66e6b746b..5500d4f7f5 100644
--- a/ChangeLog.SimGrid-java
+++ b/ChangeLog.SimGrid-java
@@ -1,5 +1,11 @@
 ChangeLog for SimGrid-java, before its integration into the main source tree.
 
+SimGrid (3.13) UNRELEASED; urgency=low
+
+ Backwards Compatibility breaks
+   - VM.setBound(int load) is now VM.setBound(double bound) to meet the MSG semantics. Use VM.getSpeed()*load/100 for the legacy behavior.
+
+
 SimGrid-java (3.9) stable; urgency=low
 
  -- 2013-01-30 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
diff --git a/examples/java/cloud/migration/XVM.java b/examples/java/cloud/migration/XVM.java
index f34da08607..b62529e7b9 100644
--- a/examples/java/cloud/migration/XVM.java
+++ b/examples/java/cloud/migration/XVM.java
@@ -32,7 +32,7 @@ public class XVM extends VM {
 
   public void setLoad(int load){  
     if (load >0) {
-      this.setBound(load);
+      this.setBound(this.getSpeed()*load/100);
       //    this.getDaemon().setLoad(load);
       daemon.resume();
     } else{
diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 8de5b98387..60c6609ff5 100644
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -77,11 +77,10 @@ Java_org_simgrid_msg_VM_isRestoring(JNIEnv * env, jobject jvm) {
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jint load) { 
+Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound) { 
 
   msg_vm_t vm = jvm_get_native(env,jvm);
-  double bound = MSG_get_host_speed(vm) * load / 100;
-  MSG_vm_set_bound(vm, bound); 
+  MSG_vm_set_bound(vm, bound);
 }
 
 JNIEXPORT void JNICALL
diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h
index 04c02f9185..12de5fd706 100644
--- a/src/bindings/java/jmsg_vm.h
+++ b/src/bindings/java/jmsg_vm.h
@@ -87,7 +87,7 @@ Java_org_simgrid_msg_VM_isRestoring(JNIEnv *env, jobject jvm);
  * Signature  (D)B
  */
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jint load); 
+Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound); 
 
 /**
  * Class            org_simgrid_msg_VM
diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 77cdaeeb1b..6752b0b6ae 100644
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -131,10 +131,10 @@ public class VM extends Host{
 
 
 	/**
-	 * Bound the VM to a certain % of its vcpu capability (e.g. 75% of vm.getSpeed())
-	 * @param load percentage (between [0,100]
+	 * Set a CPU bound for a given VM.
+	 * @param bound in flops/s
 	 */
-	public native void setBound(int load);
+	public native void setBound(double bound);
 
 	/**
 	 * start the VM