A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix a compiler error seen on Flag2 job of jenkins
[simgrid.git]
/
examples
/
platforms
/
syscoord
/
generate_peer_platform.pl
diff --git
a/examples/platforms/syscoord/generate_peer_platform.pl
b/examples/platforms/syscoord/generate_peer_platform.pl
index 9e4c6a3568a752807e5bc786a84a4df6a5c00f95..d5eccd18663dd35da3e8660b7dc586de1dff5936 100755
(executable)
--- a/
examples/platforms/syscoord/generate_peer_platform.pl
+++ b/
examples/platforms/syscoord/generate_peer_platform.pl
@@
-1,6
+1,6
@@
#!/usr/bin/env perl
#!/usr/bin/env perl
-# Copyright (c) 2011
, 2014, 2016
. The SimGrid Team.
+# Copyright (c) 2011
-2023
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
@@
-10,15
+10,11
@@
use strict;
use warnings;
print "<?xml version='1.0'?>\n";
use warnings;
print "<?xml version='1.0'?>\n";
-print "<!DOCTYPE platform SYSTEM \"http
://simgrid.gforge.inria.fr/simgrid
/simgrid.dtd\">\n";
+print "<!DOCTYPE platform SYSTEM \"http
s://simgrid.org
/simgrid.dtd\">\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 "<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 "\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;
print "\t<AS id=\"AS0\" routing=\"Vivaldi\">\n";
my $line;
@@
-27,12
+23,12
@@
open INPUT, $ARGV[0] or die "Unable to open $ARGV[1]: $!\n";
while(defined($line=<INPUT>))
{
next if ($line =~ /^#/);
while(defined($line=<INPUT>))
{
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";
+ # 278 7.2 -9.4 h 2.3
+ if($line =~ /^(
\S*) (\S*) (\S*) h (\S*) *
$/) {
+ print "\t\t<peer id=\"peer-$1\" coordinates=\"$2 $3 $4\" speed=\"730Mf\" bw_in=\"13.38MBps\" bw_out=\"1.024MBps\"/>\n";
next;
}
die "Parse error: $line\n";
next;
}
die "Parse error: $line\n";
-}
+}
print "\t</AS>\n";
print "</platform>\n";
print "\t</AS>\n";
print "</platform>\n";