fix the examples now that they can throw potentially more exception types

[simgrid.git] / examples / java / basic / Master.java

diff --git a/examples/java/basic/Master.java b/examples/java/basic/Master.java
index d3d354b..eab3bf5 100644 (file)
--- a/examples/java/basic/Master.java
+++ b/examples/java/basic/Master.java
@@ -1,8 +1,7 @@
 /*
- * $Id$
+ * Master of a basic master/slave example in Java
  *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier         
- * All rights reserved. 
+ * Copyright 2006,2007,2010 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. 
@@ -11,72 +10,31 @@
 import simgrid.msg.*;
 
 public class Master extends simgrid.msg.Process {
-   public void main(String[] args) throws JniException, NativeException {
-      Msg.info("hello!");
-        
-      int slaveCount = 0;
-      Host[] slaves = null;
-      
-      Msg.info("argc="+args.length);
-      for (int i = 0; i<args.length; i++)          
-       Msg.info("argv:"+args[i]);
-      
-      if (args.length < 3) {
-        Msg.info("Master needs 3 arguments");
+   public void main(String[] args) throws MsgException {
+      if (args.length < 4) {
+        Msg.info("Master needs 4 arguments");
         System.exit(1);
       }
       
-      int numberOfTasks = Integer.valueOf(args[0]).intValue();         
+      int tasksCount = Integer.valueOf(args[0]).intValue();            
       double taskComputeSize = Double.valueOf(args[1]).doubleValue();          
       double taskCommunicateSize = Double.valueOf(args[2]).doubleValue();
-      BasicTask[] todo = new BasicTask[numberOfTasks];
-      
-      String taskName = null;
       
-      for (int i = 0; i < numberOfTasks; i++) {
-        todo[i] = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); 
-      }
+      int slavesCount = Integer.valueOf(args[3]).intValue();
       
-      slaveCount = args.length - 3;
-      slaves = new Host[slaveCount];
+      Msg.info("Hello! Got "+  slavesCount + " slaves and "+tasksCount+" tasks to process");
       
-      for(int i = 3; i < args.length ; i++)  {
-        try {
-           slaves[i-3] = Host.getByName(args[i]);
-        }
-        catch(HostNotFoundException e) {
-           Msg.info("Unknown host " + args[i] + ". Stopping Now!");
-           e.printStackTrace();
-           System.exit(1);
-        }
+      for (int i = 0; i < tasksCount; i++) {
+        Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); 
+        Msg.info("Sending \"" + task.getName()+ "\" to \"slave_" + i % slavesCount + "\"");
+        task.send("slave_"+(i%slavesCount));
       }
       
-      Msg.info("Got "+  slaveCount + " slave(s) :");
-      
-      for (int i = 0; i < slaveCount; i++)
-       Msg.info("\t"+slaves[i].getName());
-      
-      Msg.info("Got "+ numberOfTasks + " task to process.");
-      
-      Channel channel = new Channel(0);
-      
-      for (int i = 0; i < numberOfTasks; i++) {
-        Msg.info("Sending \"" + todo[i].getName()+ "\" to \"" + slaves[i % slaveCount].getName() + "\"");
-        
-        if((Host.currentHost()).equals(slaves[i % slaveCount])) 
-          Msg.info("Hey ! It's me ! ");
-        
-        channel.put(todo[i], slaves[i % slaveCount]);
-      }
-      
-      Msg.info("Send completed");
-      
       Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");
       
-      for (int i = 0; i < slaveCount; i++) {
-        BasicTask task = new BasicTask("finalize", 0, 0);
-        task.setData(221297);   
-        channel.put(task,slaves[i]);
+      for (int i = 0; i < slavesCount; i++) {
+        FinalizeTask task = new FinalizeTask();
+        task.send("slave_"+(i%slavesCount));
       }
       
       Msg.info("Goodbye now!");