From: Dirk Koopman Date: Fri, 2 Nov 2007 16:19:11 +0000 (+0100) Subject: Merge branch 'master' of /scm/spider X-Git-Tag: 1.55~41 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=5e61d31d9f317fcef97a66e1ac1944cb17b42eec;hp=46f7bad38aa5081e9d53671e52d7f6a461b3b292;p=spider.git Merge branch 'master' of /scm/spider --- diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl index 58967955..b0757ecf 100644 --- a/cmd/mrtg.pl +++ b/cmd/mrtg.pl @@ -64,7 +64,7 @@ if ($want{agw}) { if (!$main::is_win && ($want{proc} || $want{all})) { $ENV{COLUMNS} = 250; my $secs; - my $f = new IO::File "ps aux |"; + my $f = new IO::File "ps ax -ocputime,args |"; # dbg("$f"); if ($f) { while (<$f>) { @@ -75,8 +75,9 @@ if (!$main::is_win && ($want{proc} || $want{all})) { next if $l =~ m{bash\s+\-c}; my @f = split /\s+/, $l; # dbg("$f[9]"); - my ($m, $s) = split /:/, $f[9]; - $secs = ($m * 60) + $s; + my ($d, $h, $m, $s) = $f[0] =~ /(?:(\d+)-)?(\d+):(\d\d):(\d\d)$/; + $d ||= 0; + $secs = ($d * 86400) + ($h * 3600) + ($m * 60) + $s; last; } $f->close;