X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94446121333b0ae1ae6eea3c32124fd4b3df62f2..d44ed07cd1cb3f4fceb9dc45e1161723f0fdc9a0:/examples/gras/all2all/make_deployment.pl

diff --git a/examples/gras/all2all/make_deployment.pl b/examples/gras/all2all/make_deployment.pl
index 1e4bf687a5..3220e86353 100755
--- a/examples/gras/all2all/make_deployment.pl
+++ b/examples/gras/all2all/make_deployment.pl
@@ -21,16 +21,16 @@ EOH
 }
 
 my $input    = shift @ARGV || usage();
-my $nb_hosts = shift @ARGV || usage();
 my $size_msg = shift @ARGV || usage();
-my $source   = shift || "";
+my $source   = shift @ARGV || "";
+my $nb_hosts = shift @ARGV || 0;
 
 my @host;
 
 open IN,$input || die "Cannot open $input: $!\n";
 
 while (<IN>) {
-  next unless /<cpu name="([^"]*)"/; # "
+  next unless /<host id="([^"]*)"/; # "
   
   push @host, $1;
 }
@@ -40,68 +40,68 @@ while (<IN>) {
 die "No host found in $input. Is it really a SimGrid platform file?\nCheck that you didn't pass a deployment file, for example.\n"
   unless (scalar @host);
 
+if (! $nb_hosts) {
+    $nb_hosts = scalar @host;
+}
+
+
 # 
 # Build the receiver string
 
-my $receivers;    # strings containing sender argument describing all receivers.
+my @receivers;    # strings containing sender argument describing all receivers.
 
 my $it_host=0;    # iterator
 my $it_port=4000; # iterator, in case we have so much processes to add that we must change it
 
 for (my $i=0; $i<$nb_hosts; $i++) {
-  $receivers .= "    <argument value=\"$host[$it_host]:$it_port\"/>\n";
+  push (@receivers, "$host[$it_host]:$it_port");
   $it_host ++;
   if ($it_host == scalar @host) {
     $it_host=0;
     $it_port++;
   }
 }
-$receivers .= "    <argument value=\"$size_msg\"/>\n";
 
 #
 # 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 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=\"receiver\">\n";
-  print "    <argument value=\"$it_port\"/><argument value=\"".(length($source)?1:$nb_hosts)."\"/>\n";
-  print "  </process>\n\n";
-    
-  $it_host ++;
-  if ($it_host == scalar @host) {
-    $it_host=0;
-    $it_port++;
-  }
+print "<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n";
+print "<platform version=\"2\">\n\n";
+
+for my $r (@receivers) {
+    my ($h, $p) = split(':', $r);
+    print "  <process host=\"".$h."\" function=\"receiver\">\n";
+    print "    <argument value=\"$p\"/><argument value=\"".(length($source)?1:$nb_hosts)."\"/>\n";
+    print "  </process>\n\n";
 }
 
 #
 # 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++;
-  }
+if(length($source)) {
+    print "  <process host=\"".$host[$source % (scalar @host)].
+	"\" function=\"sender\">\n";
+    for my $r (@receivers) {
+	print "    <argument value=\"$r\"/>\n"; 
+    }
+    print "    <argument value=\"$size_msg\"/>\n"; 
+    print "  </process>\n";
+} else {
+    my $i = 0; 
+    for my $r (@receivers) {
+	my ($h, $p) = split(":", $r); 
+        print "  <process host=\"".$h."\" function=\"sender\">\n";
+        for (my $j = 0; $j < $nb_hosts; $j++) {
+           my $r2 = $receivers[($i + $j) % ($nb_hosts)]; 
+           print "    <argument value=\"$r2\"/>\n"; 
+        }
+        print "    <argument value=\"$size_msg\"/>\n"; 
+        print "  </process>\n";
+        $i++;
+    }
 }
 
-print "</platform_description>\n";
+print "</platform>\n";
 
 # print "source='$source' nb_hosts=$nb_hosts\n";