Gras_stub_generator does not produce the same files as it used to

[simgrid.git] / examples / gras / all2all / make_deployment.pl

diff --git a/examples/gras/all2all/make_deployment.pl b/examples/gras/all2all/make_deployment.pl
index cf0e4c0..1e4bf68 100755 (executable)
--- a/examples/gras/all2all/make_deployment.pl
+++ b/examples/gras/all2all/make_deployment.pl
@@ -4,12 +4,17 @@ use strict;
 
 sub usage {
     print STDERR <<EOH
-Usage: all2all_make_deployment.pl platform_file.xml nb_host
+Usage: all2all_make_deployment.pl platform_file.xml nb_host size_msg (bcast source?)
   
 This script generates a deployment file for the all2all program. It takes 
 a SimGrid platform file as first argument and the number of wanted peers as 
 second argument. If the amount of peers exceeds the amount of available 
-hosts in the deployment file, several peers will be placed on the same host. 
+hosts in the deployment file, several peers will be placed on the same host.
+
+The third argument is a size of the message to send ( octets )  
+
+If a fourth argument is passed, this is the source of the broadcast
+(given as a number between 0 and nb_host-1).
 EOH
       ;
     die "\n";
@@ -17,6 +22,8 @@ EOH
 
 my $input    = shift @ARGV || usage();
 my $nb_hosts = shift @ARGV || usage();
+my $size_msg = shift @ARGV || usage();
+my $source   = shift || "";
 
 my @host;
 
@@ -49,25 +56,22 @@ for (my $i=0; $i<$nb_hosts; $i++) {
     $it_port++;
   }
 }
+$receivers .= "    <argument value=\"$size_msg\"/>\n";
 
 #
-# and now, really generate the file
+# and now, really generate the file. Receiver first.
 
 print "<?xml version='1.0'?>\n";
 print "<!DOCTYPE platform_description SYSTEM \"surfxml.dtd\">\n";
-print "<platform_description>\n\n";
+print "<platform_description version=\"1\">\n\n";
 
 # reset iterators
 $it_port=4000;
 $it_host=0;
 
 for (my $i=0; $i<$nb_hosts; $i++) {
-  print "  <process host=\"".$host[$it_host]."\" function=\"sender\">\n";
-  print $receivers;
-  print "  </process>\n";
-    
   print "  <process host=\"".$host[$it_host]."\" function=\"receiver\">\n";
-  print "    <argument value=\"$it_port\"/><argument value=\"$nb_hosts\"/>\n";
+  print "    <argument value=\"$it_port\"/><argument value=\"".(length($source)?1:$nb_hosts)."\"/>\n";
   print "  </process>\n\n";
     
   $it_host ++;
@@ -77,4 +81,27 @@ for (my $i=0; $i<$nb_hosts; $i++) {
   }
 }
 
+#
+# Here come the sender(s)
+
+# reset iterators
+$it_port=4000;
+$it_host=0;
+
+for (my $i=0; $i<$nb_hosts; $i++) {
+  if (!length($source) || $source == $i) {
+      print "  <process host=\"".$host[$it_host]."\" function=\"sender\">\n";
+      print $receivers;
+      print "  </process>\n";
+  }
+    
+  $it_host ++;
+  if ($it_host == scalar @host) {
+    $it_host=0;
+    $it_port++;
+  }
+}
+
 print "</platform_description>\n";
+
+# print "source='$source' nb_hosts=$nb_hosts\n";