This example can now be used to stress-test the VMs

diff --git a/examples/java/cloud/masterworker/Main.java b/examples/java/cloud/masterworker/Main.java
index fb36463..9c342da 100644 (file)
--- a/examples/java/cloud/masterworker/Main.java
+++ b/examples/java/cloud/masterworker/Main.java
@@ -13,7 +13,7 @@ import org.simgrid.msg.MsgException;
 class Main {
   public static final double TASK_COMP_SIZE = 10;
   public static final double TASK_COMM_SIZE = 10;
-  public static final int NHOSTS = 2 ; 
+  public static final int NHOSTS = 2; 
 
   private Main() {
     throw new IllegalAccessError("Utility class");

diff --git a/examples/java/cloud/masterworker/Master.java b/examples/java/cloud/masterworker/Master.java
index c2b95d9..4983d71 100644 (file)
--- a/examples/java/cloud/masterworker/Master.java
+++ b/examples/java/cloud/masterworker/Master.java
@@ -8,59 +8,63 @@ package cloud.masterworker;
 
 import java.util.ArrayList;
 
-import org.simgrid.msg.Msg;
-import org.simgrid.msg.VM;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.Task;
-import org.simgrid.msg.Process;
+import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
+import org.simgrid.msg.Process;
+import org.simgrid.msg.Task;
+import org.simgrid.msg.VM;
 
-public class Master extends Process {
-  private Host[] hosts;
-
-  public Master(Host host, String name, Host[] hosts) {
-    super(host,name,null);
-    this.hosts = hosts;
-  }
-
-  public void main(String[] args) throws MsgException {
-    int workersCount = Main.NHOSTS;
-    ArrayList<VM> vms = new ArrayList<>();
-
-    // Create one VM per host and bind a process inside each one. 
-    for (int i = 0; i < workersCount; i++) {
-      Msg.info("create VM0"+i);  
-      VM vm = new VM(hosts[i+1],"VM0"+i);
-      vm.start();
-      vms.add(vm);
-      Worker worker= new Worker(vm,i);
-      Msg.info("Put Worker "+worker.getName()+ " on "+vm.getName());
-      worker.start();
-    }
-
-    Msg.info("Launched " + vms.size() + " VMs");
-
-    Msg.info("Send a first batch of work to everyone");
-    workBatch(workersCount);
-
-    Msg.info("Suspend all VMs");
-    for (int i = 0; i < vms.size(); i++) {
-      Msg.info("Suspend "+vms.get(i).getName());
-      vms.get(i).suspend();
-    }
-
-    Msg.info("Wait a while");
-    waitFor(2);
-
-    Msg.info("Resume all VMs.");
-    for (int i = 0; i < vms.size(); i++) {
-      vms.get(i).resume();
-    }
-
-    Msg.info("Sleep long enough for everyone to be done with previous batch of work");
-    waitFor(1000 - Msg.getClock());
+//import eu.plumbr.api.Plumbr;
 
-/*    Msg.info("Add one more process per VM.");
+public class Master extends Process {
+       private Host[] hosts;
+
+       public Master(Host host, String name, Host[] hosts) {
+               super(host,name,null);
+               this.hosts = hosts;
+       }
+
+       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<>();
+                       // 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();
+                       }
+
+                       Msg.info("Launched " + vms.size() + " VMs");
+
+                       Msg.info("Send a first batch of 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();
+                       }
+
+                       Msg.verb("Wait a while");
+                       waitFor(2);
+
+                       Msg.verb("Resume all VMs.");
+                       for (int i = 0; i < vms.size(); i++) {
+                               vms.get(i).resume();
+                       }
+
+                       Msg.verb("Sleep long enough for everyone to be done with previous batch of work");
+                       waitFor(1000*(step+1) - Msg.getClock());
+
+                       /*    Msg.info("Add one more process per VM.");
     for (int i = 0; i < vms.size(); i++) {
       VM vm = vms.get(i);
       Worker worker = new Worker(vm,i + vms.size());
@@ -68,27 +72,29 @@ public class Master extends Process {
     }
 
     workBatch(workersCount * 2);
-*/
-
-    Msg.info("Migrate everyone to "+hosts[3].getName());
-    for (int i = 0; i < vms.size(); i++) {
-      Msg.info("Migrate "+vms.get(i).getName()+"from"+hosts[i+1].getName()+"to "+hosts[3].getName());
-      vms.get(i).migrate(hosts[3]);
-    }
-
-    Msg.info("Let's shut down the simulation and kill everyone.");
-
-    for (int i = 0; i < vms.size(); i++) {
-      vms.get(i).destroy();
-    }
-    Msg.info("Master done.");
-  }
-
-  public void workBatch(int workersCount) throws MsgException {
-    for (int i = 0; i < workersCount; i++) {
-      Task task = new Task("Task0" + i, Main.TASK_COMP_SIZE, Main.TASK_COMM_SIZE);
-      Msg.info("Sending to WRK0" + i);
-      task.send("MBOX:WRK0" + i);
-    }
-  }
+                        */
+
+                       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]);
+                       }
+
+                       Msg.verb("Let's shut down the simulation and kill everyone.");
+
+                       for (int i = 0; i < vms.size(); i++) {
+                               vms.get(i).destroy();
+                       }
+                       Msg.info("XXXXXXXXXXXXXXX Step "+step+" done.");
+//                     Plumbr.endTransaction();
+               }
+       }
+
+       public void workBatch(int workersCount, String nameRoot) throws MsgException {
+               for (int i = 0; i < workersCount; i++) {
+                       Task task = new Task("Task "+nameRoot + i, Main.TASK_COMP_SIZE, Main.TASK_COMM_SIZE);
+                       Msg.verb("Sending to "+ nameRoot + i);
+                       task.send(nameRoot + i);
+               }
+       }
 }

diff --git a/examples/java/cloud/masterworker/Worker.java b/examples/java/cloud/masterworker/Worker.java
index cf09aa9..a048bfe 100644 (file)
--- a/examples/java/cloud/masterworker/Worker.java
+++ b/examples/java/cloud/masterworker/Worker.java
@@ -6,33 +6,31 @@
 
 package cloud.masterworker;
 
-import org.simgrid.msg.Msg;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.Task;
-import org.simgrid.msg.Process;
+import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
+import org.simgrid.msg.Process;
+import org.simgrid.msg.Task;
 
 public class Worker extends Process {
-  private int number;
-  public Worker(Host host, int number) {
-    super(host,"WRK0" + number,null);
-    this.number = number;
+  public Worker(Host host, String name) {
+    super(host, name);
   }
 
   public void main(String[] args) throws MsgException {
-    Msg.info(this.getName() +" is listening on MBOX:WRK0"+ number);
+    Msg.verb(this.getName() +" is listening on "+ getName());
     while(true) {
       Task task =null;
       try {
-        task = Task.receive("MBOX:WRK0"+number);
+        task = Task.receive(getName());
         if (task == null)
           break;
       } catch (MsgException e) {
         Msg.debug("Received failed. I'm done. See you!");
       }
-      Msg.info("Received \"" + task.getName() +  "\". Processing it.");
+      Msg.verb("Received \"" + task.getName() +  "\". Processing it.");
       task.execute();
-      Msg.info(this.getName() +" executed task (" + task.getName()+")");
+      Msg.verb(this.getName() +" executed task (" + task.getName()+")");
     }
   }
 }