X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b0757ecfa1407796bcd15cf2772e04ec5968350a;hb=8eb97fa0b7aa30c63519a1ad41e65356ea765a2b;hp=4f0214e9110e91050d70fa3bf2b5146f77398f84;hpb=c32170b5b05416143021fb165a27072ce861350b;p=spider.git

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 4f0214e9..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;
@@ -146,13 +147,13 @@ if ($want{pc92} || $want{all}) {
 				  "PC92 <font color=#00cc00>C</font> and <font color=#0000ff>K</font> records into $main::mycall",
 				  'Bytes / Sec', 'C', 'K') unless $want{dataonly};
 	$mc->data('pc92ck', $DXProt::pc92Cin, $DXProt::pc92Kin, "PC92 C and K into $main::mycall") unless $want{cfgonly};
-#	$DXProt::pc92C = $DXProt::pc92K = 0;
+#	$DXProt::pc92Cin = $DXProt::pc92Kin = 0;
 
 	$mc->cfgprint('pc92ad', [], 1024000,
 				  "PC92 <font color=#00cc00>A</font> and <font color=#0000ff>D</font> records into $main::mycall",
 				  'Bytes / Sec', 'A', 'D') unless $want{dataonly};
 	$mc->data('pc92ad', $DXProt::pc92Ain, $DXProt::pc92Din, "PC92 A and D into $main::mycall") unless $want{cfgonly};
-#	$DXProt::pc92A = $DXProt::pc92D = 0;
+#	$DXProt::pc92Ain = $DXProt::pc92Din = 0;
 
 }