mirror of
https://git.savannah.gnu.org/git/parallel.git
synced 2024-10-18 12:59:39 +00:00
parallel: Swap activity now has different tricks for each platform.
This commit is contained in:
Ole Tange
parent
c95bc2872c
commit
47919ddb97
|
|
@ -236,6 +236,10 @@ New in this release:
|
||||||
|
|
||||||
* Speeding up grep log queries with GNU Parallel http://www.tripwire.com/state-of-security/incident-detection/speeding-grep-queries-gnu-parallel/
|
* Speeding up grep log queries with GNU Parallel http://www.tripwire.com/state-of-security/incident-detection/speeding-grep-queries-gnu-parallel/
|
||||||
|
|
||||||
|
* Export quicklooks with vector overlay using TuiView http://spectraldifferences.wordpress.com/2014/03/08/export-quicklooks-with-vector-overlay-using-tuiview/
|
||||||
|
|
||||||
|
* GNU parallelで違和感 http://jarp.does.notwork.org/diary/201405c.html#201405301
|
||||||
|
|
||||||
* Bug fixes and man page updates.
|
* Bug fixes and man page updates.
|
||||||
|
|
||||||
GNU Parallel - For people who live life in the parallel lane.
|
GNU Parallel - For people who live life in the parallel lane.
|
||||||
|
|
|
||||||
147
src/parallel
147
src/parallel
|
|
@ -2869,11 +2869,11 @@ sub new {
|
||||||
'time_to_login' => undef,
|
'time_to_login' => undef,
|
||||||
'last_login_at' => undef,
|
'last_login_at' => undef,
|
||||||
'loadavg_file' => $ENV{'HOME'} . "/.parallel/tmp/loadavg-" .
|
'loadavg_file' => $ENV{'HOME'} . "/.parallel/tmp/loadavg-" .
|
||||||
$$."-".$no_slash_string,
|
$no_slash_string,
|
||||||
'loadavg' => undef,
|
'loadavg' => undef,
|
||||||
'last_loadavg_update' => 0,
|
'last_loadavg_update' => 0,
|
||||||
'swap_activity_file' => $ENV{'HOME'} . "/.parallel/tmp/swap_activity-" .
|
'swap_activity_file' => $ENV{'HOME'} . "/.parallel/tmp/swap_activity-" .
|
||||||
$$."-".$no_slash_string,
|
$no_slash_string,
|
||||||
'swap_activity' => undef,
|
'swap_activity' => undef,
|
||||||
}, ref($class) || $class;
|
}, ref($class) || $class;
|
||||||
}
|
}
|
||||||
|
|
@ -2977,16 +2977,12 @@ sub swap_activity {
|
||||||
$update_swap_activity_file = 1;
|
$update_swap_activity_file = 1;
|
||||||
}
|
}
|
||||||
if($update_swap_activity_file) {
|
if($update_swap_activity_file) {
|
||||||
::debug("Updating swap_activity file".$self->{'swap_activity_file'});
|
::debug("Updating swap_activity file ".$self->{'swap_activity_file'});
|
||||||
$self->{'last_swap_activity_update'} = time;
|
$self->{'last_swap_activity_update'} = time;
|
||||||
-e $ENV{'HOME'}."/.parallel" or mkdir $ENV{'HOME'}."/.parallel";
|
-e $ENV{'HOME'}."/.parallel" or mkdir $ENV{'HOME'}."/.parallel";
|
||||||
-e $ENV{'HOME'}."/.parallel/tmp" or mkdir $ENV{'HOME'}."/.parallel/tmp";
|
-e $ENV{'HOME'}."/.parallel/tmp" or mkdir $ENV{'HOME'}."/.parallel/tmp";
|
||||||
my $swap_activity;
|
my $swap_activity;
|
||||||
# If the (remote) machine is Mac we should use vm_stat
|
$swap_activity = swapactivityscript();
|
||||||
# swap_in and swap_out on GNU/Linux is $7 and $8
|
|
||||||
# swap_in and swap_out on Mac is $10 and $11
|
|
||||||
$swap_activity = q[ { vmstat 1 2 2> /dev/null || vm_stat 1; } | ].
|
|
||||||
q[ awk 'NR!=4{next} NF==17||NF==16{print $7*$8} NF==11{print $10*$11} {exit}' ];
|
|
||||||
if($self->{'string'} ne ":") {
|
if($self->{'string'} ne ":") {
|
||||||
$swap_activity = $self->sshcommand() . " " . $self->serverlogin() . " " .
|
$swap_activity = $self->sshcommand() . " " . $self->serverlogin() . " " .
|
||||||
::shell_quote_scalar($swap_activity);
|
::shell_quote_scalar($swap_activity);
|
||||||
|
|
@ -2996,11 +2992,136 @@ sub swap_activity {
|
||||||
# save it to a tmp file before moving it to the correct file
|
# save it to a tmp file before moving it to the correct file
|
||||||
my $file = $self->{'swap_activity_file'};
|
my $file = $self->{'swap_activity_file'};
|
||||||
my ($dummy_fh, $tmpfile) = ::tempfile(SUFFIX => ".swp");
|
my ($dummy_fh, $tmpfile) = ::tempfile(SUFFIX => ".swp");
|
||||||
qx{ ($swap_activity > $tmpfile; mv $tmpfile $file) & };
|
::debug("\n".$swap_activity."\n");
|
||||||
|
qx{ ($swap_activity > $tmpfile && mv $tmpfile $file || rm $tmpfile) & };
|
||||||
}
|
}
|
||||||
return $self->{'swap_activity'};
|
return $self->{'swap_activity'};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub swapactivityscript {
|
||||||
|
# Returns:
|
||||||
|
# shellscript for detecting swap activity
|
||||||
|
#
|
||||||
|
# arguments for vmstat are OS dependant
|
||||||
|
# swap_in and swap_out are in different columns depending on OS
|
||||||
|
#
|
||||||
|
my %vmstat = (
|
||||||
|
# linux: $7*$8
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# procs -----------memory---------- ---swap-- -----io---- -system-- ----cpu----
|
||||||
|
# r b swpd free buff cache si so bi bo in cs us sy id wa
|
||||||
|
# 5 0 51208 1701096 198012 18857888 0 0 37 153 28 19 56 11 33 1
|
||||||
|
# 3 0 51208 1701288 198012 18857972 0 0 0 0 3638 10412 15 3 82 0
|
||||||
|
'linux' => ['vmstat 1 2 | tail -n1', '$7*$8'],
|
||||||
|
|
||||||
|
# solaris: $6*$7
|
||||||
|
# $ vmstat -S 1 2
|
||||||
|
# kthr memory page disk faults cpu
|
||||||
|
# r b w swap free si so pi po fr de sr s3 s4 -- -- in sy cs us sy id
|
||||||
|
# 0 0 0 4628952 3208408 0 0 3 1 1 0 0 -0 2 0 0 263 613 246 1 2 97
|
||||||
|
# 0 0 0 4552504 3166360 0 0 0 0 0 0 0 0 0 0 0 246 213 240 1 1 98
|
||||||
|
'solaris' => ['vmstat -S 1 2 | tail -1', '$6*$7'],
|
||||||
|
|
||||||
|
# darwin (macosx): $21*$22
|
||||||
|
# $ vm_stat -c 2 1
|
||||||
|
# Mach Virtual Memory Statistics: (page size of 4096 bytes)
|
||||||
|
# free active specul inactive throttle wired prgable faults copy 0fill reactive purged file-backed anonymous cmprssed cmprssor dcomprs comprs pageins pageout swapins swapouts
|
||||||
|
# 346306 829050 74871 606027 0 240231 90367 544858K 62343596 270837K 14178 415070 570102 939846 356 370 116 922 4019813 4 0 0
|
||||||
|
# 345740 830383 74875 606031 0 239234 90369 2696 359 553 0 0 570110 941179 356 370 0 0 0 0 0 0
|
||||||
|
'darwin' => ['vm_stat -c 2 1 | tail -n1', '$21*$22'],
|
||||||
|
|
||||||
|
# ultrix: $12*$13
|
||||||
|
# $ vmstat -S 1 2
|
||||||
|
# procs faults cpu memory page disk
|
||||||
|
# r b w in sy cs us sy id avm fre si so pi po fr de sr s0
|
||||||
|
# 1 0 0 4 23 2 3 0 97 7743 217k 0 0 0 0 0 0 0 0
|
||||||
|
# 1 0 0 6 40 8 0 1 99 7743 217k 0 0 3 0 0 0 0 0
|
||||||
|
'ultrix' => ['vmstat -S 1 2 | tail -1', '$12*$13'],
|
||||||
|
|
||||||
|
# aix: $6*$7
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# System configuration: lcpu=1 mem=2048MB
|
||||||
|
#
|
||||||
|
# kthr memory page faults cpu
|
||||||
|
# ----- ----------- ------------------------ ------------ -----------
|
||||||
|
# r b avm fre re pi po fr sr cy in sy cs us sy id wa
|
||||||
|
# 0 0 333933 241803 0 0 0 0 0 0 10 143 90 0 0 99 0
|
||||||
|
# 0 0 334125 241569 0 0 0 0 0 0 37 5368 184 0 9 86 5
|
||||||
|
'aix' => ['vmstat 1 2 | tail -n1', '$6*$7'],
|
||||||
|
|
||||||
|
# freebsd: $8*$9
|
||||||
|
# $ vmstat -H 1 2
|
||||||
|
# procs memory page disks faults cpu
|
||||||
|
# r b w avm fre flt re pi po fr sr ad0 ad1 in sy cs us sy id
|
||||||
|
# 1 0 0 596716 19560 32 0 0 0 33 8 0 0 11 220 277 0 0 99
|
||||||
|
# 0 0 0 596716 19560 2 0 0 0 0 0 0 0 11 144 263 0 1 99
|
||||||
|
'freebsd' => ['vmstat -H 1 2 | tail -n1', '$8*$9'],
|
||||||
|
|
||||||
|
# mirbsd: $8*$9
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# procs memory page disks traps cpu
|
||||||
|
# r b w avm fre flt re pi po fr sr wd0 cd0 int sys cs us sy id
|
||||||
|
# 0 0 0 25776 164968 34 0 0 0 0 0 0 0 230 259 38 4 0 96
|
||||||
|
# 0 0 0 25776 164968 24 0 0 0 0 0 0 0 237 275 37 0 0 100
|
||||||
|
'mirbsd' => ['vmstat 1 2 | tail -n1', '$8*$9'],
|
||||||
|
|
||||||
|
# netbsd: $7*$8
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# procs memory page disks faults cpu
|
||||||
|
# r b avm fre flt re pi po fr sr w0 w1 in sy cs us sy id
|
||||||
|
# 0 0 138452 6012 54 0 0 0 1 2 3 0 4 100 23 0 0 100
|
||||||
|
# 0 0 138456 6008 1 0 0 0 0 0 0 0 7 26 19 0 0 100
|
||||||
|
'netbsd' => ['vmstat 1 2 | tail -n1', '$7*$8'],
|
||||||
|
|
||||||
|
# openbsd: $8*$9
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# procs memory page disks traps cpu
|
||||||
|
# r b w avm fre flt re pi po fr sr wd0 wd1 int sys cs us sy id
|
||||||
|
# 0 0 0 76596 109944 73 0 0 0 0 0 0 1 5 259 22 0 1 99
|
||||||
|
# 0 0 0 76604 109936 24 0 0 0 0 0 0 0 7 114 20 0 1 99
|
||||||
|
'openbsd' => ['vmstat 1 2 | tail -n1', '$8*$9'],
|
||||||
|
|
||||||
|
# hpux: $8*$9
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# procs memory page faults cpu
|
||||||
|
# r b w avm free re at pi po fr de sr in sy cs us sy id
|
||||||
|
# 1 0 0 247211 216476 4 1 0 0 0 0 0 102 73005 54 6 11 83
|
||||||
|
# 1 0 0 247211 216421 43 9 0 0 0 0 0 144 1675 96 25269512791222387000 25269512791222387000 105
|
||||||
|
'hpux' => ['vmstat 1 2 | tail -n1', '$8*$9'],
|
||||||
|
|
||||||
|
# dec_osf (tru64): $11*$12
|
||||||
|
# $ vmstat 1 2
|
||||||
|
# Virtual Memory Statistics: (pagesize = 8192)
|
||||||
|
# procs memory pages intr cpu
|
||||||
|
# r w u act free wire fault cow zero react pin pout in sy cs us sy id
|
||||||
|
# 3 181 36 51K 1895 8696 348M 59M 122M 259 79M 0 5 218 302 4 1 94
|
||||||
|
# 3 181 36 51K 1893 8696 3 15 21 0 28 0 4 81 321 1 1 98
|
||||||
|
'dec_osf' => ['vmstat 1 2 | tail -n1', '$11*$12'],
|
||||||
|
|
||||||
|
# gnu (hurd): $7*$8
|
||||||
|
# $ vmstat -k 1 2
|
||||||
|
# (pagesize: 4, size: 512288, swap size: 894972)
|
||||||
|
# free actv inact wired zeroed react pgins pgouts pfaults cowpfs hrat caobj cache swfree
|
||||||
|
# 371940 30844 89228 20276 298348 0 48192 19016 756105 99808 98% 876 20628 894972
|
||||||
|
# 371940 30844 89228 20276 +0 +0 +0 +0 +42 +2 98% 876 20628 894972
|
||||||
|
'gnu' => ['vmstat -k 1 2 | tail -n1', '$7*$8'],
|
||||||
|
|
||||||
|
# -nto (qnx has no swap)
|
||||||
|
#-irix
|
||||||
|
#-svr5 (scosysv)
|
||||||
|
);
|
||||||
|
my $perlscript = "";
|
||||||
|
for my $os (keys %vmstat) {
|
||||||
|
#q[ { vmstat 1 2 2> /dev/null || vmstat -c 1 2; } | ].
|
||||||
|
# q[ awk 'NR!=4{next} NF==17||NF==16{print $7*$8} NF==22{print $21*$22} {exit}' ];
|
||||||
|
$vmstat{$os}[1] =~ s/\$/\\\\\\\$/g; # $ => \\\$
|
||||||
|
$perlscript .= 'if($^O eq "'.$os.'") { print `'.$vmstat{$os}[0].' | awk "{print ' .
|
||||||
|
$vmstat{$os}[1] . '}"` }';
|
||||||
|
}
|
||||||
|
$perlscript = "perl -e " . ::shell_quote_scalar($perlscript);
|
||||||
|
return $Global::envvar. " " .$perlscript;
|
||||||
|
}
|
||||||
|
|
||||||
sub too_fast_remote_login {
|
sub too_fast_remote_login {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
if($self->{'last_login_at'} and $self->{'time_to_login'}) {
|
if($self->{'last_login_at'} and $self->{'time_to_login'}) {
|
||||||
|
|
@ -3038,6 +3159,11 @@ sub loadavg_too_high {
|
||||||
sub loadavg {
|
sub loadavg {
|
||||||
# If the currently know loadavg is too old:
|
# If the currently know loadavg is too old:
|
||||||
# Recompute a new one in the background
|
# Recompute a new one in the background
|
||||||
|
# The load average is computed as the number of processes waiting for disk
|
||||||
|
# or CPU right now. So it is the server load this instant and not averaged over
|
||||||
|
# several minutes. This is needed so GNU Parallel will at most start one job
|
||||||
|
# that will push the load over the limit.
|
||||||
|
#
|
||||||
# Returns:
|
# Returns:
|
||||||
# $last_loadavg = last load average computed (undef if none)
|
# $last_loadavg = last load average computed (undef if none)
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
|
|
@ -3080,12 +3206,11 @@ sub loadavg {
|
||||||
# save it to a tmp file before moving it to the correct file
|
# save it to a tmp file before moving it to the correct file
|
||||||
my $file = $self->{'loadavg_file'};
|
my $file = $self->{'loadavg_file'};
|
||||||
my ($dummy_fh, $tmpfile) = ::tempfile(SUFFIX => ".loa");
|
my ($dummy_fh, $tmpfile) = ::tempfile(SUFFIX => ".loa");
|
||||||
qx{ ($cmd > $tmpfile && mv $tmpfile $file) & };
|
qx{ ($cmd > $tmpfile && mv $tmpfile $file || rm $tmpfile) & };
|
||||||
}
|
}
|
||||||
return $self->{'loadavg'};
|
return $self->{'loadavg'};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub max_loadavg {
|
sub max_loadavg {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
# If --load is a file it might be changed
|
# If --load is a file it might be changed
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue