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