Commit f28438af authored by Mike Hibler's avatar Mike Hibler

back out idleswap parsing, those are completely redundent

parent 0ecf69fa
......@@ -149,9 +149,7 @@ sub checkexpstate() {
checkcreate($rec);
}
# Experiment swapout
elsif ($action == SWAPOUT || $action == BATCHSWAPOUT ||
$action == AUTOSWAPOUT || $action == IDLESWAPOUT ||
$action == FORCEDSWAPOUT) {
elsif ($action == SWAPOUT || $action == BATCHSWAPOUT) {
checkswapout($rec);
}
# Experiment swapin
......
......@@ -49,6 +49,7 @@ my @ignore_pat = (
'^Your CD ',
'^changeuid ',
'^genelists',
'^idleswap ',
'^jabbersetup',
'^mkproj ',
'^mkgroup ',
......
......@@ -82,10 +82,6 @@ my @_swapout_pat = (
"Experiment ($PID_RE)\/($EID_RE) $SWAPPED_RE out"
);
my @swapout_pat;
my @_forcedswapout_pat = (
"idleswap (?:-r )?(-[ai] )?($PID_RE) ($EID_RE)"
);
my @forcedswapout_pat;
my @_terminate_pat = (
"Experiment ($PID_RE)\/($EID_RE) Terminated"
);
......@@ -167,7 +163,6 @@ sub compilepatterns()
map { $_->{pat} = $_->{_pat} } @create_info;
@swapin_pat = map { qr/$_/ } @_swapin_pat;
@swapout_pat = map { qr/$_/ } @_swapout_pat;
@forcedswapout_pat = map { qr/$_/ } @_forcedswapout_pat;
@terminate_pat = map { qr/$_/ } @_terminate_pat;
@batch_pat = map { qr/$_/ } @_batch_pat;
@preload_pat = map { qr/$_/ } @_preload_pat;
......@@ -351,23 +346,6 @@ sub processmsg(@) {
$state = STATE_NLSEARCH;
$msg{nodes} = {};
}
#
# For an idleswap message, we have everything we need by
# the time we parse the subject line.
#
elsif ($msg{action} == IDLESWAPOUT ||
$msg{action} == AUTOSWAPOUT ||
$msg{action} == FORCEDSWAPOUT) {
if (!$msg{stamp} || !$msg{pid} || !$msg{eid} ||
!$msg{uid} || !$msg{id}) {
print STDERR
"*** Bad idleswap message $msg{id} ignored\n"
if ($whine);
return;
}
$msg{subject} = $subject;
last;
}
$msg{subject} = $subject;
}
next;
......@@ -899,17 +877,6 @@ sub parsesubject($)
return (SWAPOUT, $1, $2);
}
}
for $pat (@forcedswapout_pat) {
if ($str =~ /$pat/) {
if (!defined($1)) {
return (FORCEDSWAPOUT, $2, $3);
}
if ($1 eq "-i ") {
return (IDLESWAPOUT, $2, $3);
}
return (AUTOSWAPOUT, $2, $3);
}
}
for $pat (@terminate_pat) {
if ($str =~ /$pat/) {
return (TERMINATE, $1, $2);
......
......@@ -14,7 +14,6 @@ use Exporter;
ISCREATE SWAPIN SWAPOUT SWAPOUTMAYBE TERMINATE BATCH BATCHIGNORE
BATCHCREATE BATCHCREATEMAYBE BATCHTERM BATCHTERMMAYBE BATCHSWAPIN
BATCHSWAPOUT BATCHPRELOAD ACTIONSTR
AUTOSWAPOUT IDLESWAPOUT FORCEDSWAPOUT
);
# Must come after package declaration!
......@@ -57,9 +56,6 @@ sub ISCREATE($)
sub SWAPIN() { return 21 };
sub SWAPOUT() { return 31 };
sub SWAPOUTMAYBE() { return 32 };
sub IDLESWAPOUT() { return 33 };
sub AUTOSWAPOUT() { return 34 };
sub FORCEDSWAPOUT() { return 35 };
sub TERMINATE() { return 41 };
......@@ -84,9 +80,6 @@ my %actiontostr = (
CREATE2() => 'CREATE',
SWAPIN() => 'SWAPIN',
SWAPOUT() => 'SWAPOUT',
AUTOSWAPOUT() => 'AUTOSWAPOUT',
IDLESWAPOUT() => 'IDLESWAPOUT',
FORCEDSWAPOUT() => 'FORCEDSWAPOUT',
TERMINATE() => 'TERMINATE',
BATCH() => 'BATCH',
BATCHCREATE() => 'BATCHCREATE',
......@@ -106,9 +99,6 @@ my %strtoaction = (
'CREATE' => CREATE2(),
'SWAPIN' => SWAPIN(),
'SWAPOUT' => SWAPOUT(),
'AUTOSWAPOUT' => AUTOSWAPOUT(),
'IDLESWAPOUT' => IDLESWAPOUT(),
'FORCEDSWAPOUT' => FORCEDSWAPOUT(),
'TERMINATE' => TERMINATE(),
'BATCH' => BATCH(),
'BATCHCREATE' => BATCHCREATE(),
......
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