Commit 4e98f35d authored by Jonathon Duerig's avatar Jonathon Duerig

Print available trunk bandwidths for advertisements.

parent 09bc1be6
...@@ -353,7 +353,7 @@ sub GetAdvertisement($$$$) ...@@ -353,7 +353,7 @@ sub GetAdvertisement($$$$)
$version = "2" $version = "2"
if ($version eq "PG 2"); if ($version eq "PG 2");
my $invocation = "$PTOPGEN -x -g $version -r"; my $invocation = "$PTOPGEN -x -g $version -r -f";
if (defined($experiment)) { if (defined($experiment)) {
my $eid = $experiment->eid(); my $eid = $experiment->eid();
$invocation .= " -e $eid"; $invocation .= " -e $eid";
......
...@@ -79,11 +79,13 @@ sub usage() ...@@ -79,11 +79,13 @@ sub usage()
" -l specifies the location of the type limit file\n" . " -l specifies the location of the type limit file\n" .
" -1 Print an rspec containing only the node component-name\n" . " -1 Print an rspec containing only the node component-name\n" .
" -z Randomize node output order\n" . " -z Randomize node output order\n" .
" -Z Force old ptopgen\n"); " -Z Force old ptopgen\n" .
" -f This is generating an advertisement rather than an internal file\n");
exit(-1); exit(-1);
} }
my $optlist = "s:e:m:vp:rSan:c:uxg:h1:l:zZCb"; my $optlist = "s:e:m:vp:rSan:c:uxg:h1:l:zZCbf";
my $is_advertisement = 0;
my $mfactor; my $mfactor;
my $virtstuff = 0; my $virtstuff = 0;
my $widearea = 0; my $widearea = 0;
...@@ -322,6 +324,14 @@ if (defined($options{"1"})) { ...@@ -322,6 +324,14 @@ if (defined($options{"1"})) {
if (defined($options{"z"})) { if (defined($options{"z"})) {
$randomize = 1; $randomize = 1;
} }
if (defined($options{"f"})) {
$is_advertisement = 1;
}
if ($is_advertisement && !$allnodes)
{
$TRACK_INTERSWITCH_BANDWIDTH = 1;
}
usage() usage()
if ($prune && !defined($exempt_eid) if ($prune && !defined($exempt_eid)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment