X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b0757ecfa1407796bcd15cf2772e04ec5968350a;hb=3cdd57e7baf63341fdcba6b764f304291ed0dbb2;hp=2f6a578bb1703f9b45263ee168783f55f447f63b;hpb=1aac4bfce7659fc802741267238f7cc008a97ca7;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 2f6a578b..b0757ecf 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -13,6 +13,7 @@
# hfvhf - all spots split into HF and VHF
# wwv - two graphs of WWV, one SFI and R other A and K
# wcy - WCY A and K
+# pc92 - PC92 C and K, PC92 A and D
# all - all of the above
#
# b) actions
@@ -63,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>) {
@@ -74,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;
@@ -139,6 +141,22 @@ if ($want{wcy} || $want{all}) {
$mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
}
+if ($want{pc92} || $want{all}) {
+
+ $mc->cfgprint('pc92ck', [], 1024000,
+ "PC92 C and K 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::pc92Cin = $DXProt::pc92Kin = 0;
+
+ $mc->cfgprint('pc92ad', [], 1024000,
+ "PC92 A and D 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::pc92Ain = $DXProt::pc92Din = 0;
+
+}
+
#
# do the mrtg thing
#