From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Tue, 18 Feb 2014 13:26:13 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_11_beta~22
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d965315a301933eca36c66b20d9e36a27b21a4e0?hp=4f04ca371b1e2847f63e80b00da3f571992b9ff4

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

diff --git a/examples/java/cloud/migration/Daemon.java b/examples/java/cloud/migration/Daemon.java
index 55d825ceb1..80cf2a8b55 100644
--- a/examples/java/cloud/migration/Daemon.java
+++ b/examples/java/cloud/migration/Daemon.java
@@ -28,7 +28,7 @@ public class Daemon extends Process {
                 suspend(); // Suspend the process
             }
             currentTask = new Task(this.getHost().getName()+"-daemon-"+(i++), this.getHost().getSpeed()*100, 0);
-            Msg.info(currentTask.getName());
+//            Msg.info(currentTask.getName());
         }
     }
 
diff --git a/examples/java/cloud/migration/Test.java b/examples/java/cloud/migration/Test.java
index d06e78ec7e..7edaa0a3a2 100644
--- a/examples/java/cloud/migration/Test.java
+++ b/examples/java/cloud/migration/Test.java
@@ -39,7 +39,12 @@ public class Test extends Process{
         int dpRate = 70;
         int load1 = 90;
         int load2 = 80;
+		
 
+		  Msg.info("This example evaluates the migration time of a VM in presence of collocated VMs on the source and the dest nodes");
+		  Msg.info("The migrated VM has a memory intensity rate of 70% of the network BW and a cpu load of 90% \"(see cloudcom 2013 paper \"Adding a Live Migration Model Into SimGrid\" for further information) "); 
+
+		  Msg.info("Load of collocated VMs fluctuate between 0 and 90% in order to create a starvation issue and see whether it impacts or not the migration time");
         XVM vm1 = null;
         vm1 = new XVM(
                 host0,
@@ -97,7 +102,7 @@ public class Test extends Process{
         for (int i=1 ; i <= collocatedDst ; i++){
             tmp = new XVM(
                     host1,
-                    "vm"+i+collocatedSrc,
+                    "vm"+(i+collocatedSrc),
                     1, // Nb of vcpu
                     2048, // Ramsize,
                     125, // Net Bandwidth
@@ -137,7 +142,6 @@ public class Test extends Process{
         endTime = Msg.getClock();
         Msg.info("     - End of Migration from host 1 to host 0 (duration:"+(endTime-startTime)+")");
 
-        waitFor(100000);
         Main.setEndOfTest();
         Msg.info("Destroy VMs");
         for (VM vm: vms)