update to pass the arguments the processes expect

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2252 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/gras/all2all/all2all_deployment.xml b/examples/gras/all2all/all2all_deployment.xml
index 6ced725..81b0b98 100644 (file)
--- a/examples/gras/all2all/all2all_deployment.xml
+++ b/examples/gras/all2all/all2all_deployment.xml
@@ -1,64 +1,67 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
 <platform_description>
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
 <platform_description>

-  <!-- The Tremblay node, arguments :: all others nodes -->
+  <!-- For each host, we have a sender and a receiver (because we use a
+       1-port model and still don't want any deadlocks neither synchronization
+       delays).
+       Sender arguments = receiver peer
+       Receiver arguments: amount of incoming messages expected -->
+
+

   <process host="Tremblay" function="sender">
   <process host="Tremblay" function="sender">

-     <argument value="4000"/>
-     <argument value="Jupiter"/>  
-     <argument value="Fafard"/> 
-     <argument value="Ginette"/> 
-     <argument value="Bourassa"/> 
-  </process>
-  <!-- The Jupiter node, arguments :: all others nodes -->
-  <process host="Jupiter" function="sender">
-     <argument value="4000"/>
-     <argument value="Tremblay"/> 
-     <argument value="Fafard"/> 
-     <argument value="Ginette"/> 
-     <argument value="Bourassa"/> 
+     <argument value="Jupiter:4000"/>
+     <argument value="Fafard:4000"/> 
+     <argument value="Ginette:4000"/> 
+     <argument value="Bourassa:4000"/> 

   </process>
   </process>

-  <!-- The Fafard node, arguments :: all others nodes -->
-  <process host="Fafard" function="sender">
-     <argument value="4000"/>
-     <argument value="Tremblay"/> 
-     <argument value="Jupiter"/>  
-     <argument value="Ginette"/> 
-     <argument value="Bourassa"/> 
-  </process>
-  <!-- The Ginette node, arguments :: all others nodes -->
-  <process host="Ginette" function="sender">
-     <argument value="4000"/>
-     <argument value="Tremblay"/> 
-     <argument value="Jupiter"/>  
-     <argument value="Fafard"/> 
-     <argument value="Bourassa"/> 
-  </process>
-  <!-- The Bourassa node, arguments :: all others nodes -->
-  <process host="Bourassa" function="sender">
-     <argument value="4000"/>
-     <argument value="Tremblay"/> 
-     <argument value="Jupiter"/>  
-     <argument value="Fafard"/> 
-     <argument value="Ginette"/> 
-  </process>
-  
-  

   <process host="Tremblay" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>  
   </process>
   <process host="Tremblay" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>  
   </process>

+
+
+  <process host="Jupiter" function="sender">
+     <argument value="Tremblay:4000"/> 
+     <argument value="Fafard:4000"/> 
+     <argument value="Ginette:4000"/> 
+     <argument value="Bourassa:4000"/> 
+  </process>

   <process host="Jupiter" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>
   </process>
   <process host="Jupiter" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>
   </process>

+
+
+  <process host="Fafard" function="sender">
+     <argument value="Tremblay:4000"/> 
+     <argument value="Jupiter:4000"/>  
+     <argument value="Ginette:4000"/> 
+     <argument value="Bourassa:4000"/> 
+  </process>

   <process host="Fafard" function="receiver">
      <argument value="4000"/>
      <argument value="4"/> 
   </process>
   <process host="Fafard" function="receiver">
      <argument value="4000"/>
      <argument value="4"/> 
   </process>

+ 
+ 
+  <process host="Ginette" function="sender">
+     <argument value="Tremblay:4000"/> 
+     <argument value="Jupiter:4000"/>  
+     <argument value="Fafard:4000"/> 
+     <argument value="Bourassa:4000"/> 
+  </process>

   <process host="Ginette" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>
   </process>
   <process host="Ginette" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>
   </process>

+
+
+  <process host="Bourassa" function="sender">
+     <argument value="Tremblay:4000"/> 
+     <argument value="Jupiter:4000"/>  
+     <argument value="Fafard:4000"/> 
+     <argument value="Ginette:4000"/> 
+  </process>

   <process host="Bourassa" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>
   <process host="Bourassa" function="receiver">
      <argument value="4000"/>
      <argument value="4"/>