fiz strange carp errors on startup with no route_*_cache files

[spider.git] / perl / Route / Node.pm

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 67014fc3a569eb4988c0877aa148a05e89a36b87..af01a1d22d47ce199478c7ac9e394c7783b2c55c 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -12,6 +12,8 @@ use DXDebug;
 use Route;
 use Route::User;
 use DXUtil;
+use DXJSON;
+use Time::HiRes qw(gettimeofday);
 
 use strict;
 
@@ -19,27 +21,27 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
 %valid = (
-                 parent => '0,Parent Calls,parray',
-                 nodes => '0,Nodes,parray',
-                 users => '0,Users,parray',
-                 usercount => '0,User Count',
-                 version => '0,Version',
+                 K => '9,Seen on PC92K,yesno',
+                 PC92C_dxchan => '9,PC92C hops,phash',
                  build => '0,Build',
+                 do_pc9x => '0,Uses pc9x,yesno',
                  handle_xml => '0,Using XML,yesno',
-                 lastmsg => '0,Last Route Msg,atime',
+                 last_PC92C => '9,Last PC92C',
                  lastid => '0,Last Route MsgID',
-                 do_pc9x => '0,Uses pc9x,yesno',
-                 via_pc92 => '0,Came in via pc92,yesno',
+                 lastmsg => '0,Last Route Msg,atime',
+                 nodes => '0,Nodes,parray',
                  obscount => '0,Obscount',
-                 last_PC92C => '9,Last PC92C',
-                 PC92C_dxchan => '9,Channel of PC92C,phash',
-                 ip => '0,IP Address',
+                 usercount => '0,User Count',
+                 users => '0,Users,parray',
+                 version => '0,Version',
+                 via_pc92 => '0,In via pc92?,yesno',
 );
 
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
 $obscount = 3;
+our $cachefn = localdata('route_node_cache');
 
 sub count
 {
@@ -63,7 +65,7 @@ sub max
 # object with that callsign. The upper layers are expected to do something
 # sensible with this!
 #
-# called as $parent->add(call, version, flags, ip)
+# called as $parent->add(call, dxchan, version, flags)
 #
 
 sub add
@@ -205,6 +207,14 @@ sub del_user
        return @out;
 }
 
+# is a user on this node
+sub is_user
+{
+       my $self = shift;
+       my $call = shift;
+       return scalar grep {$_ eq $call} @{$self->{users}};
+}
+
 sub usercount
 {
        my $self = shift;
@@ -272,6 +282,7 @@ sub calc_config_changes
        return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }
 
+
 sub new
 {
        my $pkg = shift;
@@ -385,6 +396,54 @@ sub PC92C_dxchan
        return (%{$parent->{PC92C_dxchan}});
 }
 
+sub TO_JSON { return { %{ shift() } }; }
+
+sub write_cache
+{
+       my $json = DXJSON->new;
+       $json->canonical(isdbg('routecache'));
+
+       my $ta = [ gettimeofday ];
+       my @s;
+       eval {
+               while (my ($k, $v) = each  %list) {
+                   push @s, "$k:" . $json->encode($v) . "\n";
+           }
+       };
+       if (!$@ && @s) {
+               my $fh = IO::File->new(">$cachefn") or dbg("Route::Node: Error writing $cachefn $!"), return;
+               print $fh "$_" for (sort @s);
+               $fh->close;
+       } else {
+               dbg("Route::Node::write_cache error '$@'");
+               return;
+       }
+       $json->indent(0)->canonical(0);
+       my $diff = _diffms($ta);
+       dbg("Route::Node::write_cache time to write: $diff mS");
+}
+
+sub read_cache
+{
+       my $json = DXJSON->new;
+       $json->canonical(isdbg('routecache'));
+       
+       my $ta = [ gettimeofday ];
+       my $count;
+       
+       my $fh = IO::File->new("$cachefn") or dbg("Route::Node ERROR reading $cachefn $!"), return;
+       while (my $l = <$fh>) {
+               chomp $l;
+               my ($k, $v) = split /:/, $l, 2;
+               $list{$k} = bless $json->decode($v) or carp("Route::Node json error $! decoding '$v'"), next;
+               ++$count;
+       }
+       $fh->close if $fh;;
+
+       my $diff = _diffms($ta);
+       dbg("Route::Node::read_cache time to read $count records from $cachefn : $diff mS");
+}
+
 sub DESTROY
 {
        my $self = shift;