From f42a5c32bab490dfeea8db9cd05161f284650d1c Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Thu, 25 Oct 2012 01:03:59 +0200 Subject: [PATCH] src/parallel: vmstat for 17 columns. Rhys Ulerich's vmstat version has 17 columns. procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu----- r b swpd free buff cache si so bi bo in cs us sy id wa st 0 0 0 587736 320220 62341788 0 0 20 36 1 1 4 0 95 0 0 --- src/parallel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallel b/src/parallel index 3dd74702..b01c0654 100755 --- a/src/parallel +++ b/src/parallel @@ -606,7 +606,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20121022; + $Global::version = 20121023; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; @@ -2335,7 +2335,7 @@ sub swap_activity { # 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==16{print $7*$8} NF==11{print $10*$11} {exit}' ]; + q[ awk 'NR!=4{next} NF==17||NF==16{print $7*$8} NF==11{print $10*$11} {exit}' ]; if($self->{'string'} ne ":") { $swap_activity = $self->sshcommand() . " " . $self->serverlogin() . " " . ::shell_quote_scalar($swap_activity);