X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=bd5f06011fc650f65883703ba0ea52dedb84d529;hb=17de485c3ef46f712b11a476e8174d75cac2d0d8;hp=763c60bda86747a30df086dac5c10f2f11e3c14c;hpb=2733a992ac8c3d315c110a2cc1984ea0a5e5d0ff;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 763c60bd..bd5f0601 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -18,6 +18,9 @@ use Prefix; use DXDupe; use Data::Dumper; use QSL; +use DXSql; +use Time::HiRes qw(gettimeofday tv_interval); + use strict; @@ -66,6 +69,10 @@ $filterdef = bless ([ $totalspots = $hfspots = $vhfspots = 0; $use_db_for_search = 0; +our %spotcache; # the cache of data within the last $spotcachedays 0 or 2+ days +our $spotcachedays = 2; + + our $readback = 1; if ($readback) { @@ -124,6 +131,7 @@ sub init mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); $statp = DXLog::new($dirprefix, "dys", 'd'); + my $today = Julian::Day->new(time); # load up any old spots if ($main::dbh) { @@ -134,7 +142,6 @@ sub init $main::dbh->spot_create_table; my $now = Julian::Day->alloc(1995, 0); - my $today = Julian::Day->new(time); my $sth = $main::dbh->spot_insert_prepare; while ($now->cmp($today) <= 0) { my $fh = $fp->open($now); @@ -177,6 +184,39 @@ sub init dbg("added ipaddr field to spot table"); } } + + # initialise the cache if required + if ($spotcachedays > 0) { + my $t0 = [gettimeofday]; + $spotcachedays = 2 if $spotcachedays < 2; + dbg "Spot::init - reading in $spotcachedays days of spots into cache"; + for (my $i = 0; $i < $spotcachedays; ++$i) { + my $now = $today->sub($i); + my $fh = $fp->open($now); + if ($fh) { + my @in; + my $rec; + for ($rec = 0; <$fh>; ++$rec) { + chomp; + my @s = split /\^/; + if (@s < 14) { + my @a = (Prefix::cty_data($s[1]))[1..3]; + my @b = (Prefix::cty_data($s[4]))[1..3]; + push @s, $b[1] if @s < 7; + push @s, '' if @s < 8; + push @s, @a[0,1], @b[0,1] if @s < 12; + push @s, $a[2], $b[2] if @s < 14; + } + unshift @in, \@s; + } + $fh->close; + dbg("Spot::init read $rec spots from " . _cachek($now)); + $spotcache{_cachek($now)} = \@in; + } + $now->add(1); + } + dbg("Spot::init $spotcachedays files of spots read into cache in " . _diffms($t0) . "mS") + } } sub prefix @@ -220,6 +260,12 @@ sub add { my $buf = join('^', @_); $fp->writeunix($_[2], $buf); + if ($spotcachedays > 0) { + my $now = Julian::Day->new($_[2]); + my $day = _cachek($now); + my $r = (exists $spotcache{$day}) ? $spotcache{$day} : ($spotcache{$day} = []); + unshift @$r, \@_; + } if ($main::dbh) { $main::dbh->begin_work; $main::dbh->spot_insert(\@_); @@ -270,7 +316,7 @@ sub add sub search { - my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_; + my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan) = @_; my @out; my $ref; my $i; @@ -292,7 +338,7 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; if ($main::dbh && $use_db_for_search) { - return $main::dbh->spot_search($hint, $dayfrom, $dayto, $to-$from, $dxchan); + return $main::dbh->spot_search($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan); } # $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name @@ -312,49 +358,70 @@ sub search my $fh; my $now = $fromdate; - my @spots; - my $recs; + my $today = Julian::Day->new($main::systime); for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only last if $now->cmp($todate) <= 0; - - my $fn = $fp->fn($now->sub($i)); - if ($readback) { - dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); - $fh = IO::File->new("$readback $fn |"); - } - else { - dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search'); - $fh = $fp->open($now->sub($i)); # get the next file - } - if ($fh) { - my $rec = 0; - my $in; - while (<$fh>) { - my @r = split /\^/; + + + my $this = $now->sub($i); + my $fn = $fp->fn($this); + my $cachekey = _cachek($this); + my $rec = 0; + + if ($spotcachedays > 0 && $spotcache{$cachekey}) { + foreach my $r (@{$spotcache{$cachekey}}) { ++$rec; - if ($dxchan) { - my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r); + if ($dofilter && $dxchan && $dxchan->{spotsfilter}) { + my ($gotone, undef) = $dxchan->{spotsfilter}->it(@$r); next unless $gotone; } - if (&$ecode(\@r)) { + if (&$ecode($r)) { ++$count; next if $count < $from; - if ($readback) { - push @out, \@r; - last if $count >= $to; - } else { - push @out, \@r; - shift @out if $count >= $to; + push @out, $r; + last if $count >= $to; + } + } + dbg("Spot::search cache recs read: $rec") if isdbg('search'); + } else { + if ($readback) { + dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); + $fh = IO::File->new("$readback $fn |"); + } + else { + dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search'); + $fh = $fp->open($now->sub($i)); # get the next file + } + if ($fh) { + my $in; + while (<$fh>) { + chomp; + my @r = split /\^/; + ++$rec; + if ($dofilter && $dxchan && $dxchan->{spotsfilter}) { + my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r); + next unless $gotone; + } + if (&$ecode(\@r)) { + ++$count; + next if $count < $from; + if ($readback) { + push @out, \@r; + last if $count >= $to; + } else { + push @out, \@r; + shift @out if $count >= $to; + } } } + dbg("Spot::search file recs read: $rec") if isdbg('search'); + last if $count >= $to; # stop after to } - dbg("Spot::search recs read: $rec") if isdbg('search'); - last if $count >= $to; # stop after to - - return ("Spot search error", $@) if $@; } } + return ("Spot search error", $@) if $@; + @out = sort {$b->[2] <=> $a->[2]} @out if @out; return @out; } @@ -510,6 +577,26 @@ sub daily { my $date = Julian::Day->new($main::systime)->sub(1); genstats($date) unless checkstats($date); + clean_cache(); +} + +sub _cachek +{ + return "$_[0]->[0]|$_[0]->[1]"; +} + +sub clean_cache +{ + if ($spotcachedays > 0) { + my $now = Julian::Day->new($main::systime); + for (my $i = $spotcachedays; $i < $spotcachedays + 5; ++$i ) { + my $k = _cachek($now->sub($i)); + if (exists $spotcache{$k}) { + dbg("Spot::spotcache deleting day $k, more than $spotcachedays days old"); + delete $spotcache{$k}; + } + } + } } 1;