Adapt to version 2 of platform files

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

diff --git a/examples/gras/all2all/make_deployment.pl b/examples/gras/all2all/make_deployment.pl
index 8698ac6..3220e86 100755 (executable)
--- a/examples/gras/all2all/make_deployment.pl
+++ b/examples/gras/all2all/make_deployment.pl
@@ -30,7 +30,7 @@ my @host;
 open IN,$input || die "Cannot open $input: $!\n";
 
 while (<IN>) {
 open IN,$input || die "Cannot open $input: $!\n";
 
 while (<IN>) {

-  next unless /<cpu name="([^"]*)"/; # "
+  next unless /<host id="([^"]*)"/; # "

   
   push @host, $1;
 }
   
   push @host, $1;
 }


@@ -66,8 +66,8 @@ for (my $i=0; $i<$nb_hosts; $i++) {
 # and now, really generate the file. Receiver first.
 
 print "<?xml version='1.0'?>\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";
+print "<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n";
+print "<platform version=\"2\">\n\n";

 
 for my $r (@receivers) {
     my ($h, $p) = split(':', $r);
 
 for my $r (@receivers) {
     my ($h, $p) = split(':', $r);


@@ -102,6 +102,6 @@ if(length($source)) {
     }
 }
 
     }
 }
 

-print "</platform_description>\n";
+print "</platform>\n";

 
 # print "source='$source' nb_hosts=$nb_hosts\n";
 
 # print "source='$source' nb_hosts=$nb_hosts\n";

diff --git a/examples/gras/mutual_exclusion/simple_token/make_deployment.pl b/examples/gras/mutual_exclusion/simple_token/make_deployment.pl
index b25f614..2fba770 100755 (executable)
--- a/examples/gras/mutual_exclusion/simple_token/make_deployment.pl
+++ b/examples/gras/mutual_exclusion/simple_token/make_deployment.pl
@@ -25,7 +25,7 @@ if (! $nb_hosts) {
 # map { print "$_\n" } @host;
 
 print "<?xml version='1.0'?>\n";
 # map { print "$_\n" } @host;
 
 print "<?xml version='1.0'?>\n";

-print "<!DOCTYPE platform SYSTEM \"surfxml.dtd\">\n";
+print "<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n";

 print "<platform version=\"2\">\n\n";
 
 
 print "<platform version=\"2\">\n\n";
 
 

diff --git a/examples/gras/pmm/make_deployment.pl b/examples/gras/pmm/make_deployment.pl
index 43433f0..6d8fe8e 100755 (executable)
--- a/examples/gras/pmm/make_deployment.pl
+++ b/examples/gras/pmm/make_deployment.pl
@@ -26,7 +26,7 @@ my @host;
 open IN,$input || die "Cannot open $input: $!\n";
 
 while (<IN>) {
 open IN,$input || die "Cannot open $input: $!\n";
 
 while (<IN>) {

-  next unless /<cpu name="([^"]*)"/; # "
+  next unless /<host id="([^"]*)"/; # "

   
   push @host, $1;
 }
   
   push @host, $1;
 }


@@ -47,8 +47,8 @@ my $port_num = 4000;
 my $master = $host[0];
 
 print "<?xml version='1.0'?>\n";
 my $master = $host[0];
 
 print "<?xml version='1.0'?>\n";

-print "<!DOCTYPE platform_description SYSTEM \"surfxml.dtd\">\n";
-print "<platform_description version=\"1\">\n\n";
+print "<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n";
+print "<platform version=\"2\">\n\n";

 print "  <!-- The master, argument :: port number -->\n";
 print "  <process host=\"$master\" function=\"master\">\n";
 print "    <argument value=\"$port_num\"/>\n";
 print "  <!-- The master, argument :: port number -->\n";
 print "  <process host=\"$master\" function=\"master\">\n";
 print "    <argument value=\"$port_num\"/>\n";


@@ -68,5 +68,5 @@ for (my $i=0; $i<$nb_slaves; $i++) {
 }
 
 
 }
 
 

-print "</platform_description>\n";
+print "</platform>\n";