Commit f532b039 authored by Robert Ricci's avatar Robert Ricci
Browse files

Back out Leigh's hack to show assign only one switch at a time, since

we can now handle cross-switch links.
parent 3c21b3ae
......@@ -20,11 +20,10 @@
$delaythresh = 3;
$maxrun = 20;
$delaywithswitch=0;
$assignlog = "assign.log";
$DELAYCAPACITY = @DELAYCAPACITY@;
$TBROOT = "@prefix@";
$ENV{'PATH'} = "/bin:/usr/bin:$TBROOT/libexec:$TBROOT/sbin:$TBROOT/bin";
$ENV{'PATH'} = "/usr/bin:$TBROOT/libexec:$TBROOT/sbin:$TBROOT/bin";
use lib '@prefix@/lib';
use libdb;
......@@ -325,9 +324,6 @@ DBQueryFatal("UPDATE experiments set maximum_nodes=$maximum_nodes, " .
print "Minumum nodes = $minimum_nodes\n";
print "Maximum nodes = $maximum_nodes\n";
# Init assign.log with the topfile.
system("cat $topfile > $assignlog");
######################################################################
# Step 2 - Assign Loop
#
......@@ -358,18 +354,7 @@ while (1) {
undef %plinks;
# Snapshot
# XXX HACK!!! Alternate switches for now.
my $switchtouse;
if ($currentrun & 1) {
$switchtouse = "-s cisco3";
}
else {
$switchtouse = "-s cisco1";
}
system("ptopgen $switchtouse > $ptopfile");
# Add latest ptop to log.
system("cat $ptopfile >> $assignlog");
system("ptopgen > $ptopfile");
# Get number of nodes
my $numnodes_result =
......@@ -388,7 +373,7 @@ while (1) {
# Run assign
$fail = 0;
print "assign -b -t $ptopfile $topfile\n";
open(ASSIGNFP,"assign -b -t $ptopfile $topfile | tee -a $assignlog |");
open(ASSIGNFP,"assign -b -t $ptopfile $topfile | tee assign.log |");
$violations = 0;
$score = -1;
......
Supports Markdown
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