Update copyright headers.

[simgrid.git] / examples / java / cloud / masterworker / Worker.java

diff --git a/examples/java/cloud/masterworker/Worker.java b/examples/java/cloud/masterworker/Worker.java
index 2220730..8970754 100644 (file)
--- a/examples/java/cloud/masterworker/Worker.java
+++ b/examples/java/cloud/masterworker/Worker.java
@@ -1,40 +1,34 @@
-/* Copyright (c) 2012-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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 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 listenning on MBOX:WRK0"+ number);
+    Msg.verb(this.getName() +" is listening on "+ getName());
     while(true) {
-      Task task;
-      try {
-        task = Task.receive("MBOX:WRK0"+number);
-      } catch (MsgException e) {
-        Msg.debug("Received failed. I'm done. See you!");
-        break;
-      }
-      Msg.info("Received \"" + task.getName() +  "\". Processing it.");
+      Task task = null;
       try {
-        task.execute();
+        task = Task.receive(getName());
       } catch (MsgException e) {
+        Msg.info("Received failed. I'm done. See you!");
+        exit();
       }
-      Msg.info(this.getName() +" executed task (" + task.getName()+")");
+      Msg.verb("Received '" + task.getName() +  "'. Processing it.");
+      task.execute();
+      Msg.verb("Done executing task '" + task.getName() +"'");
     }
   }
 }