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

[simgrid.git] / examples / java / masterslave / masterslaveDeployment.xml

diff --git a/examples/java/masterslave/masterslaveDeployment.xml b/examples/java/masterslave/masterslaveDeployment.xml
index 6c01ac0..5f249f1 100644 (file)
--- a/examples/java/masterslave/masterslaveDeployment.xml
+++ b/examples/java/masterslave/masterslaveDeployment.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
   <process host="Jacquelin" function="masterslave.Master">
      <argument value="5"/>     <!-- Amount of tasks to dispatch -->
      <argument value="50000"/> <!-- Computation size of each task -->
      <argument value="10"/>    <!-- Communication size of each one -->
      <argument value="7"/>     <!-- Amount of slaves waiting for orders -->
   </process>
-  
+
   <process host="Jackson" function="masterslave.Forwarder">
      <argument value="0"/>  <!-- Input mailbox -->
      <argument value="7"/>  <!-- First output mailbox -->
@@ -18,32 +18,14 @@
      <argument value="9"/>  <!-- First output mailbox -->
      <argument value="10"/> <!-- Last output mailbox -->
   </process>
-  
-  <process host="iRMX" function="masterslave.Slave">
-     <argument value="2"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Bousquet" function="masterslave.Slave">
-     <argument value="3"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Soucy" function="masterslave.Slave">
-     <argument value="4"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Kuenning" function="masterslave.Slave">
-     <argument value="5"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Browne" function="masterslave.Slave">
-     <argument value="6"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Stephen" function="masterslave.Slave">
-     <argument value="7"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Robert" function="masterslave.Slave">
-     <argument value="8"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Sirois" function="masterslave.Slave">
-     <argument value="9"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Monique" function="masterslave.Slave">
-     <argument value="10"/>  <!-- Input mailbox -->
-  </process>  
+
+  <process host="iRMX" function="masterslave.Slave">      <argument value="2"/>  <!-- Input mailbox --> </process>
+  <process host="Bousquet" function="masterslave.Slave">  <argument value="3"/>  <!-- Input mailbox --> </process>
+  <process host="Soucy" function="masterslave.Slave">     <argument value="4"/>  <!-- Input mailbox --> </process>
+  <process host="Kuenning" function="masterslave.Slave">  <argument value="5"/>  <!-- Input mailbox --> </process>
+  <process host="Browne" function="masterslave.Slave">    <argument value="6"/>  <!-- Input mailbox --> </process>
+  <process host="Stephen" function="masterslave.Slave">   <argument value="7"/>  <!-- Input mailbox --> </process>
+  <process host="Robert" function="masterslave.Slave">    <argument value="8"/>  <!-- Input mailbox --> </process>
+  <process host="Sirois" function="masterslave.Slave">    <argument value="9"/>  <!-- Input mailbox --> </process>
+  <process host="Monique" function="masterslave.Slave">   <argument value="10"/> <!-- Input mailbox --> </process>
 </platform>