From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 24 Feb 2016 22:24:41 +0000 (+0100)
Subject: cosmetics in the coordinate-based platform files
X-Git-Tag: v3_13~684
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf8bbc99663c8ca036cdf7266c4848f348509676?hp=d1a8a4e291642999663c8cff03158c1041ff4916

cosmetics in the coordinate-based platform files
---

diff --git a/examples/platforms/syscoord/generate_peer_platform.pl b/examples/platforms/syscoord/generate_peer_platform.pl
index a866f87bf1..9e4c6a3568 100755
--- a/examples/platforms/syscoord/generate_peer_platform.pl
+++ b/examples/platforms/syscoord/generate_peer_platform.pl
@@ -9,31 +9,30 @@
 use strict;
 use warnings;
 
-my $toversion=4;
-my $nb_peer = $ARGV[0];
-my $i;
-
 print "<?xml version='1.0'?>\n";
 print "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n";
-print "<platform version=\"$toversion\">\n";
+print "<platform version=\"4\">\n\n";
+
+print "<!-- This file was generated with the following command:\n          generate_peer_platform.pl $ARGV[0]\n-->\n\n";
 
-print "\n<config id=\"General\">\n";
-print "\t<prop id=\"coordinates\" value=\"yes\"></prop>\n";
-print "</config>\n\n";
+print "\t<config id=\"General\">\n";
+print "\t\t<prop id=\"coordinates\" value=\"yes\"></prop>\n";
+print "\t</config>\n\n";
 
 print "\t<AS id=\"AS0\" routing=\"Vivaldi\">\n";
 
 my $line;
 
-open SITES_LIGNE, $ARGV[0] or die "Unable to open $ARGV[1]\n";
-while(defined($line=<SITES_LIGNE>))
+open INPUT, $ARGV[0] or die "Unable to open $ARGV[1]: $!\n";
+while(defined($line=<INPUT>))
 {
-    #278 7.2 -9.4 h 2.3 
-    if($line =~ /^(.*) (.*) (.*) h (.*)$/)
-    {
-	print "\t\t<peer id=\"peer-$1\" coordinates=\"$2 $3 $4\" speed=\"730Mf\" ";
-	print "bw_in=\"13.38MBps\" bw_out=\"1.024MBps\" lat=\"500us\"/>\n";
+    next if ($line =~ /^#/);
+    # 278 7.2 -9.4 h 2.3 
+    if($line =~ /^(.*) (.*) (.*) h (.*)$/) {
+	print "\t\t<peer id=\"peer-$1\" coordinates=\"$2 $3 $4\" speed=\"730Mf\" bw_in=\"13.38MBps\" bw_out=\"1.024MBps\" lat=\"500us\"/>\n";
+	next;
     }
+    die "Parse error: $line\n";
 }			
 print "\t</AS>\n";
 print "</platform>\n";
diff --git a/examples/platforms/syscoord/median_harvard.syscoord b/examples/platforms/syscoord/median_harvard.syscoord
index 13cf361662..c8222425c6 100644
--- a/examples/platforms/syscoord/median_harvard.syscoord
+++ b/examples/platforms/syscoord/median_harvard.syscoord
@@ -1,3 +1,6 @@
+# This data was retrieved from the OptorSim configuration files. 
+# Use the generate_peer_platform.pl script to turn it into a SimGrid platform file.
+#
 0 173.0 96.8 h 0.1 
 1 247.0 57.3 h 0.6 
 2 243.4 58.8 h 1.4 
diff --git a/examples/platforms/syscoord/median_meridian.syscoord b/examples/platforms/syscoord/median_meridian.syscoord
index 427656df46..163e2facb7 100644
--- a/examples/platforms/syscoord/median_meridian.syscoord
+++ b/examples/platforms/syscoord/median_meridian.syscoord
@@ -1,3 +1,6 @@
+# This data was retrieved from the OptorSim configuration files. 
+# Use the generate_peer_platform.pl script to turn it into a SimGrid platform file.
+#
 0 25.5 9.4 h 1.4 
 1 -12.7 -9.9 h 2.1 
 2 -15.7 9.9 h 14.7 
diff --git a/examples/platforms/syscoord/median_p2psim.syscoord b/examples/platforms/syscoord/median_p2psim.syscoord
index 2d72aed53a..eaee214ff8 100644
--- a/examples/platforms/syscoord/median_p2psim.syscoord
+++ b/examples/platforms/syscoord/median_p2psim.syscoord
@@ -1,3 +1,8 @@
+# This data was retrieved from the OptorSim configuration files. 
+# Use the generate_peer_platform.pl script to turn it into a SimGrid platform file.
+#
+# See also https://pdos.csail.mit.edu/archive/p2psim/kingdata/
+#
 0 -30.8 -183.3 h 0.4 
 1 -1.3 3.4 h 5.4 
 2 6.6 6.7 h 7.7