Commit 94fad099 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Actually invoke the ptopgen randomization in protogeni calls.

parent 70f1cab0
...@@ -1207,7 +1207,7 @@ sub GetTicketAuxAux($$$$$$$$$) ...@@ -1207,7 +1207,7 @@ sub GetTicketAuxAux($$$$$$$$$)
"Could not verify topo"); "Could not verify topo");
goto bad; goto bad;
} }
system("$MAPPER -a -d -v -u -o $tmpfile $pid $eid"); system("$MAPPER -a -d -v -u -z -o $tmpfile $pid $eid");
if ($?) { if ($?) {
my $logstuff = undef; my $logstuff = undef;
...@@ -1956,7 +1956,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -1956,7 +1956,7 @@ sub SliverWorkAux($$$$$$$)
goto bad; goto bad;
} }
# Add -u for update mode, but not -f (fixnode). # Add -u for update mode, but not -f (fixnode).
system("$MAPPER -d -v -u $pid $eid"); system("$MAPPER -d -v -z -u $pid $eid");
if ($?) { if ($?) {
my $logstuff = undef; my $logstuff = undef;
$message = "Could not map to resources"; $message = "Could not map to resources";
......
...@@ -38,7 +38,7 @@ my $NoRecover = 0; ...@@ -38,7 +38,7 @@ my $NoRecover = 0;
sub usage () sub usage ()
{ {
print STDERR "Usage: $0 [-v] [-u [-f] | -n] pid eid\n"; print STDERR "Usage: $0 [-v] [-u [-f] | -n] [-z] pid eid\n";
print STDERR " -v - Enables verbose output\n"; print STDERR " -v - Enables verbose output\n";
print STDERR " -u - Enables update mode\n"; print STDERR " -u - Enables update mode\n";
print STDERR " -f - Fix current resources during update mode\n"; print STDERR " -f - Fix current resources during update mode\n";
...@@ -49,9 +49,10 @@ sub usage () ...@@ -49,9 +49,10 @@ sub usage ()
print STDERR " -p - Do a precheck for mapability on an empty testbed - ". print STDERR " -p - Do a precheck for mapability on an empty testbed - ".
"implies -n\n"; "implies -n\n";
print STDERR " -l - Use rspec v2 instead of the text file format\n"; print STDERR " -l - Use rspec v2 instead of the text file format\n";
print STDERR " -z - Randomize node order printed by ptopgen\n";
exit($WRAPPER_FAILED); exit($WRAPPER_FAILED);
} }
my $optlist = "dvunfprqczxm:ko:alt"; my $optlist = "dvunfprqczxm:ko:altz";
my $verbose = 0; my $verbose = 0;
my $debug = 0; my $debug = 0;
my $fixmode = 0; my $fixmode = 0;
...@@ -73,6 +74,7 @@ my $warnings = 0; ...@@ -73,6 +74,7 @@ my $warnings = 0;
my $maxrun = 3; # Maximum number of times we run assign. my $maxrun = 3; # Maximum number of times we run assign.
my $gotlock = 0; my $gotlock = 0;
my $userspec = 0; my $userspec = 0;
my $randomize = 0;
my $vtop; my $vtop;
# #
...@@ -193,6 +195,9 @@ if (defined($options{"c"})) { ...@@ -193,6 +195,9 @@ if (defined($options{"c"})) {
if (defined($options{"l"})) { if (defined($options{"l"})) {
$userspec = 1; $userspec = 1;
} }
if (defined($options{"z"})) {
$randomize = 1;
}
my $pid = $ARGV[0]; my $pid = $ARGV[0];
my $eid = $ARGV[1]; my $eid = $ARGV[1];
...@@ -519,6 +524,9 @@ sub RunAssign($$) ...@@ -519,6 +524,9 @@ sub RunAssign($$)
if ($userspec == 1) { if ($userspec == 1) {
$ptopargs .= "-x -g 2 "; $ptopargs .= "-x -g 2 ";
} }
if ($randomize == 1) {
$ptopargs .= "-z ";
}
$ptopargs .= "-l $typelimitfile" $ptopargs .= "-l $typelimitfile"
if (scalar(keys(%admission_control))); if (scalar(keys(%admission_control)));
......
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