From: minima Date: Sun, 29 Sep 2002 21:23:56 +0000 (+0000) Subject: stop the Timer::handler searching its chain more than once a second X-Git-Tag: PRE-1-52~177 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3f58f5ebe86a749d9e1ab37f25b3e7c7255a1906;p=spider.git stop the Timer::handler searching its chain more than once a second add flexibility to the mrtg stuff --- diff --git a/Changes b/Changes index bb4f33df..e9dd7d2f 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ 29Sep02======================================================================= 1. Added LRU caching to DXUsers and Prefix. +2. make Timer::handler only search its chain once a second seeing as that +is the minimum granularity available. +3. add some separation between cfg file making, data generation and mrtg +running. See /spider/cmd/mrtg.pl for some instructions... 28Sep02======================================================================= 1. Put some transparent caching into Prefix.pm to see if this has a performance impact. diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl index c88d5c7c..6e279985 100644 --- a/cmd/mrtg.pl +++ b/cmd/mrtg.pl @@ -4,7 +4,26 @@ # # Your mrtg binary must live in one of the standard places # -# you will need perl 5.6 (probably) to be able to run this command +# The arguments (keywords) to the mrtg command are these +# +# a) content (you always get the node users and nodes) +# totalspots - all spots +# 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 +# all - all of the above +# +# b) actions +# test - do everything except check for and run mrtg +# nomrtg - ditto (better name) +# dataonly - only generate the data files for mrtg +# cfgonly - only generate the mrtg.cfg file (like cfgmaker) +# runmrtg - run mrtg, this is probably used with dataonly +# - together with a home rolled mrtg.cfg +# +# Copyright (c) 2002 Dirk Koopman G1TLH +# +# $Id$ # my ($self, $line) = @_; @@ -12,8 +31,9 @@ my ($self, $line) = @_; # create the arg list my %want; for (split /\s+/, $line) { $want{lc $_} = 1}; - -return (1, "MRTG not installed") unless $want{test} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg'; +$want{nomrtg} = 1 if $want{cfgonly} || $want{test}; + +return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg'; my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!"); @@ -21,49 +41,56 @@ my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!"); my $users = DXChannel::get_all_users(); my $nodes = DXChannel::get_all_nodes(); -$mc->cfgprint('users', $users, $nodes, [qw(gauge)], 500, +$mc->cfgprint('users', [qw(gauge)], 500, "Users and Nodes on $main::mycall", - 'Users / Nodes', 'Users', 'Nodes'); + 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly}; +$mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly}; # do the total users and nodes if ($want{totalusers} || $want{all}) { $nodes = Route::Node::count(); $users = Route::User::count(); - $mc->cfgprint('totalusers', $users, $nodes, [qw(gauge)], 10000, + $mc->cfgprint('totalusers', [qw(gauge)], 10000, 'Total Users and Nodes in the Visible Cluster Network', - 'Users / Nodes', 'Users', 'Nodes'); + 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly}; + $mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly}; } # do the total spots if ($want{totalspots} || $want{all}) { - $mc->cfgprint('totalspots', $Spot::totalspots, $Spot::totalspots, [qw(unknaszero gauge noi)], 1000, 'Total Spots', - 'Spots', 'Spots', 'Spots'); + $mc->cfgprint('totalspots', [qw(unknaszero gauge noi)], 1000, 'Total Spots', + 'Spots', 'Spots', 'Spots') unless $want{dataonly}; + $mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly}; $Spot::totalspots = 0; } # do the HF and VHF spots if ($want{hfvhf} || $want{all}) { - $mc->cfgprint('hfspots', $Spot::hfspots, $Spot::vhfspots, [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots', - 'Spots', 'HF', 'VHF'); + $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots', + 'Spots', 'HF', 'VHF') unless $want{dataonly}; + $mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly}; $Spot::hfspots = $Spot::vhfspots = 0; } # wwv stuff if ($want{wwv} || $want{all}) { - $mc->cfgprint('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), [qw(gauge)], 1000, 'WWV SFI and R', - 'SFI / R', 'SFI', 'R'); - $mc->cfgprint('wwvka', $Geomag::a, $Geomag::k, [qw(gauge)], 1000, 'WWV A and K', - 'A / K', 'A', 'K'); + $mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV SFI and R', + 'SFI / R', 'SFI', 'R') unless $want{dataonly}; + $mc->data('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), 'WWV SFI and R') unless $want{cfgonly}; + $mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV A and K', + 'A / K', 'A', 'K') unless $want{dataonly}; + $mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly}; } # WCY stuff if ($want{wcy} || $want{all}) { - $mc->cfgprint('wcyka', $WCY::a, $WCY::k, [qw(gauge)], 1000, 'WCY A and K', - 'A / K', 'A', 'K'); + $mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY A and K', + 'A / K', 'A', 'K') unless $want{dataonly}; + $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly}; } # # do the mrtg thing # -my @out = $mc->run unless $want{test}; +my @out = $mc->run unless $want{nomrtg}; return (1, @out); diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm index 8a6e79ed..e9ded9e6 100644 --- a/perl/Mrtg.pm +++ b/perl/Mrtg.pm @@ -56,17 +56,24 @@ sub run return `mrtg $self->{cfg}`; } -sub cfgprint +sub data { - my ($self, $name, $vali, $valo, $options, $max, $title, $legend, $iname, $oname) = @_; - my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer); + my ($self, $name, $vali, $valo, $title) = @_; my $uptime = main::uptime(); - if (my $m = new IO::File ">$self->{dir}/$name") { + if (my $m = new IO::File ">$self->{dir}/$name" ) { $m->print("$vali\n$valo\n$uptime\n$title\n"); $m->close; + } else { + dbg("MRTG: cannot open $self->{dir}/$name $!"); } - +} + +sub cfgprint +{ + my ($self, $name, $options, $max, $title, $legend, $iname, $oname) = @_; + my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer); + $self->{mc}->print(<<"EOF"); # diff --git a/perl/Timer.pm b/perl/Timer.pm index 4a1e1c42..fc110315 100644 --- a/perl/Timer.pm +++ b/perl/Timer.pm @@ -22,6 +22,8 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)) $main::build += $VERSION; $main::branch += $BRANCH; +my $lasttime = 0; + sub new { my ($pkg, $time, $proc, $recur) = @_; @@ -45,7 +47,9 @@ sub del sub handler { my $now = time; - + + return unless $now != $lasttime; + # handle things on the timer chain my $t; foreach $t (@timerchain) { @@ -54,6 +58,8 @@ sub handler $t->{t} = $now + $t->{interval} if exists $t->{interval}; } } + + $lasttime = $now; } sub DESTROY