X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e235f741cb5b7031059af2f4da28dcf7436d2c0..9d9ce54c6f7365b58c10d4a4fb2f1b280d3ec482:/examples/java/cloud/masterworker/Master.java

diff --git a/examples/java/cloud/masterworker/Master.java b/examples/java/cloud/masterworker/Master.java
index 4983d71c69..ea80d77a67 100644
--- a/examples/java/cloud/masterworker/Master.java
+++ b/examples/java/cloud/masterworker/Master.java
@@ -1,13 +1,10 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2017. 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. */
 
 package cloud.masterworker;
 
-import java.util.ArrayList;
-
 import org.simgrid.msg.Host;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
@@ -15,8 +12,6 @@ import org.simgrid.msg.Process;
 import org.simgrid.msg.Task;
 import org.simgrid.msg.VM;
 
-//import eu.plumbr.api.Plumbr;
-
 public class Master extends Process {
 	private Host[] hosts;
 
@@ -28,41 +23,37 @@ public class Master extends Process {
 	public void main(String[] args) throws MsgException {
 		int workersCount = Main.NHOSTS;
 
-		for (int step = 0; step < 100000 ; step++) {
-			//Plumbr.startTransaction("Migration");
-			ArrayList<VM> vms = new ArrayList<>();
+		for (int step = 1; step <= Main.NSTEPS ; step++) {
 			// Create one VM per host and bind a process inside each one. 
 			for (int i = 0; i < workersCount; i++) {
 				Msg.verb("create VM0-s"+step+"-"+i);  
 				VM vm = new VM(hosts[i+1],"VM0-s"+step+"-"+i);
 				vm.start();
-				vms.add(vm);
 				Worker worker= new Worker(vm,"WK:"+step+":"+ i);
 				Msg.verb("Put Worker "+worker.getName()+ " on "+vm.getName());
 				worker.start();
 			}
+			VM[] vms = VM.all();
 
-			Msg.info("Launched " + vms.size() + " VMs");
+			Msg.info("Launched " + vms.length + " VMs");
 
-			Msg.info("Send a first batch of work to everyone");
+			Msg.info("Send some work to everyone");
 			workBatch(workersCount,"WK:"+step+":");
 
 			Msg.info("Suspend all VMs, wait a while, resume them, migrate them and shut them down.");
-			for (int i = 0; i < vms.size(); i++) {
-				Msg.verb("Suspend "+vms.get(i).getName());
-				vms.get(i).suspend();
+			for (VM vm : vms) {
+				Msg.verb("Suspend "+vm.getName());
+				vm.suspend();
 			}
 
-			Msg.verb("Wait a while");
+			Msg.verb("Wait a while, and resume all VMs.");
 			waitFor(2);
-
-			Msg.verb("Resume all VMs.");
-			for (int i = 0; i < vms.size(); i++) {
-				vms.get(i).resume();
-			}
+			for (VM vm : vms) 
+				vm.resume();
+			
 
 			Msg.verb("Sleep long enough for everyone to be done with previous batch of work");
-			waitFor(1000*(step+1) - Msg.getClock());
+			waitFor(1000*step - Msg.getClock());
 
 			/*    Msg.info("Add one more process per VM.");
     for (int i = 0; i < vms.size(); i++) {
@@ -75,18 +66,16 @@ public class Master extends Process {
 			 */
 
 			Msg.verb("Migrate everyone to "+hosts[3].getName());
-			for (int i = 0; i < vms.size(); i++) {
-				Msg.verb("Migrate "+vms.get(i).getName()+" from "+hosts[i+1].getName()+"to "+hosts[3].getName());
-				vms.get(i).migrate(hosts[3]);
+			for (VM vm : vms) {
+				Msg.verb("Migrate "+vm.getName()+" to "+hosts[3].getName());
+				vm.migrate(hosts[3]);
 			}
 
-			Msg.verb("Let's shut down the simulation and kill everyone.");
+			Msg.verb("Let's kill everyone.");
 
-			for (int i = 0; i < vms.size(); i++) {
-				vms.get(i).destroy();
-			}
+			for (VM vm : vms) 
+				vm.destroy();
 			Msg.info("XXXXXXXXXXXXXXX Step "+step+" done.");
-//			Plumbr.endTransaction();
 		}
 	}