use Data::Dumper;
use DXDebug;
use DXUtil;
-
+use LRU;
use strict;
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw($db %prefix_loc %pre %cache $lasttime $hits $matchtotal);
+use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
$db = undef; # the DB_File handle
%prefix_loc = (); # the meat of the info
%pre = (); # the prefix list
-%cache = (); # a runtime cache of matched prefixes
-$lasttime = 0; # last time this cache was cleared
-$hits = $matchtotal = 1; # cache stats
+$hits = $misses = $matchtotal = 1; # cache stats
+$lrusize = 2000; # size of prefix LRU cache
+
+$lru = LRU->newbase('Prefix', $lrusize);
sub load
{
+ # untie every thing
if ($db) {
undef $db;
untie %pre;
%pre = ();
%prefix_loc = ();
}
- $db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0666, $DB_BTREE) or confess "can't tie \%pre ($!)";
+
+ # tie the main prefix database
+ $db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0664, $DB_BTREE) or confess "can't tie \%pre ($!)";
my $out = $@ if $@;
do "$main::data/prefix_data.pl" if !$out;
$out = $@ if $@;
- # print Data::Dumper->Dump([\%pre, \%prefix_loc], [qw(pre prefix_loc)]);
- return $out;
+
+ return $out;
}
sub store
sub matchprefix
{
my $pref = shift;
+ my @partials;
for (my $i = length $pref; $i; $i--) {
$matchtotal++;
my $s = substr($pref, 0, $i);
- my $p = $cache{$s};
+ push @partials, $s;
+ my $p = $lru->get($s);
if ($p) {
$hits++;
if (isdbg('prefix')) {
- my $percent = $hits * 100 / $matchtotal;
- dbg("Partial Prefix Cache Hit: $s Hits: $hits of $matchtotal = $percent\%");
+ my $percent = sprintf "%.1f", $hits * 100 / $misses;
+ dbg("Partial Prefix Cache Hit: $s Hits: $hits/$misses of $matchtotal = $percent\%");
}
+ $lru->put($_, $p) for @partials;
return @$p;
} else {
+ $misses++;
my @out = get($s);
if (isdbg('prefix')) {
my $part = $out[0] || "*";
dbg("Partial prefix: $pref $s $part" );
}
if (@out && $out[0] eq $s) {
- $cache{$s} = \@out;
+ $lru->put($_, \@out) for @partials;
return @out;
- }
+ }
}
}
return ();
my $p;
my @parts;
my ($call, $sp, $i);
-
- # clear out the cache periodically to stop it growing for ever.
- if ($main::systime - $lasttime >= 15*60) {
- if (isdbg('prefix')) {
- my $percent = $hits * 100 / $matchtotal;
- dbg("Prefix Cache Cleared, Hits: $hits of $matchtotal = $percent\%") ;
- }
- my $percent = $hits * 100 / $matchtotal;
- dbg("Prefix Cache Cleared, $percent\% hits") if isdbg('prefix');
- %cache =();
- $lasttime = $main::systime;
- $hits = $matchtotal = 0;
- }
LM: foreach $call (split /,/, $calls) {
# first check if the whole thing succeeds either because it is cached
# or because it simply is a stored prefix as callsign (or even a prefix)
$matchtotal++;
- my $p = $cache{$call};
+ $call =~ s/-\d+$//; # ignore SSIDs
+ my $p = $lru->get($call);
my @nout;
if ($p) {
$hits++;
if (isdbg('prefix')) {
- my $percent = $hits * 100 / $matchtotal;
- dbg("Prefix Cache Hit: $call Hits: $hits of $matchtotal = $percent\%");
+ my $percent = sprintf "%.1f", $hits * 100 / $misses;
+ dbg("Prefix Cache Hit: $call Hits: $hits/$misses of $matchtotal = $percent\%");
}
push @out, @$p;
next;
} else {
@nout = get($call);
if (@nout && $nout[0] eq $call) {
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
dbg("got exact prefix: $nout[0]") if isdbg('prefix');
push @out, @nout;
next;
@nout = get($s);
if (@nout && $nout[0] eq $s) {
dbg("got exact multipart prefix: $call $s") if isdbg('prefix');
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
push @out, @nout;
next;
}
my @try = get($s);
if (@try && $try[0] eq $s) {
dbg("got 3 part prefix: $call $s") if isdbg('prefix');
- $cache{$call} = \@try;
+ $misses++;
+ $lru->put($call, \@try);
push @out, @try;
next;
}
my @try = get($s);
if (@try && $try[0] eq $s) {
dbg("got 2 part prefix: $call $s") if isdbg('prefix');
- $cache{$call} = \@try;
+ $misses++;
+ $lru->put($call, \@try);
push @out, @try;
next;
}
@nout = matchprefix($parts[0]);
if (@nout) {
dbg("got prefix: $call = $nout[0]") if isdbg('prefix');
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
push @out, @nout;
next;
}
dbg("Compound prefix: $try $part" );
}
if (@try && $try eq $try[0]) {
- $cache{$call} = \@try;
+ $misses++;
+ $lru->put($call, \@try);
push @out, @try;
} else {
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
push @out, @nout;
}
} else {
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
push @out, @nout;
}
next LM;
# we are a pirate!
@nout = matchprefix('Q');
- $cache{$call} = \@nout;
+ $misses++;
+ $lru->put($call, \@nout);
push @out, @nout;
}
- if (isdbg('prefix')) {
+ if (isdbg('prefixdata')) {
my $dd = new Data::Dumper([ \@out ], [qw(@out)]);
dbg($dd->Dumpxs);
}