From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Tue, 22 Oct 2013 11:06:47 +0000 (+0200)
Subject: Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
X-Git-Tag: v3_11_beta~297^2^2~17
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c4a28141285b1569c48c4b72b16114f6f6a3218c?hp=16acdf4bdfb9dbf9adf8456aa3665cd3d4f63ad5

Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
---

diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc
index 0987ed6b9e..32c08c5009 100644
--- a/doc/doxygen/platform.doc
+++ b/doc/doxygen/platform.doc
@@ -371,14 +371,17 @@ router_name = prefix + clusterId + router_ + suffix;
 
 <b>cluster example</b>
 \verbatim
-<cluster id="my_cluster_1" prefix="" suffix=""
-  		radical="0-262144"	power="1000000000"    bw="125000000"     lat="5E-5"/>
-<cluster id="my_cluster_1" prefix="c-" suffix=".me"
-  		radical="0-99"	power="1000000000"    bw="125000000"     lat="5E-5"
-        bb_bw="2250000000" bb_lat="5E-4"/>
+<cluster id="my_cluster_1" prefix="" suffix="" radical="0-262144"
+         power="1e9" bw="125e6" lat="5E-5"/>
+
+<cluster id="my_cluster_1" prefix="c-" suffix=".me" radical="0-99"
+         power="1e9" bw="125e6" lat="5E-5"
+         bb_bw="2.25e9" bb_lat="5E-4"/>
 \endverbatim
-The second examples creates 100 machines, which names are the following:
+The second examples creates one router and 100 machines, which names 
+are the following:
 \verbatim
+c-my_cluster_1_router.me
 c-0.my_cluster_1.me
 c-1.my_cluster_1.me
 c-2.my_cluster_1.me
diff --git a/src/bindings/java/jmsg_process.c b/src/bindings/java/jmsg_process.c
index 2f6216eeba..2edf52824b 100644
--- a/src/bindings/java/jmsg_process.c
+++ b/src/bindings/java/jmsg_process.c
@@ -335,7 +335,7 @@ Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env,
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
  {
-  double time =  jmillis / 1000 + jnanos / 1000;
+  double time =  ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000;
   msg_error_t rv;
   rv = MSG_process_sleep(time);
   if (rv != MSG_OK) {
diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c
index 3ad81676b5..1e60bfb12a 100644
--- a/src/bindings/java/jmsg_task.c
+++ b/src/bindings/java/jmsg_task.c
@@ -225,6 +225,18 @@ 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)
+{
+  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) {
diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java
index 95ab081c1a..2b7b2dd98b 100644
--- a/src/bindings/java/org/simgrid/msg/Task.java
+++ b/src/bindings/java/org/simgrid/msg/Task.java
@@ -168,6 +168,11 @@ public class Task {
      * @throws TaskCancelledException
      */
 	public native void execute() throws HostFailureException,TaskCancelledException;
+	/**
+	 * Bound a computation to a certain load
+	 *
+	 */
+	public native void setBound(double load); 
 	/**
 	 * Cancels a task.
 	 *
diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 238ed6a3df..68c92a4e38 100644
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -84,6 +84,7 @@ public class VM extends Host{
 	
 
 	/* JNI / Native code */
+
 	/* get/set property methods are inherited from the Host class. */
 	
 	/** Returns whether the given VM is currently suspended
@@ -157,6 +158,7 @@ public class VM extends Host{
 	 */	
 	public void migrate(Host destination){
 		this.internalmig(destination);
+		this.currentHost = destination; 
 	}
 	
 	/** Immediately suspend the execution of all processes within the given VM