X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=69d043d81e8fd154bcc8f977549a8b28a86220d9;hb=5756741d9682667ae5b0442c4e6f609bd481b6eb;hp=4aa8be9ead142bdee079e45a11150d9f29a95d07;hpb=b55a5be0062fb96613a2f42c25de550d69283b7a;p=spider.git diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm index 4aa8be9e..69d043d8 100644 --- a/perl/Route/Node.pm +++ b/perl/Route/Node.pm @@ -21,19 +21,20 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount); @ISA = qw(Route); %valid = ( - 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,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,PC92C hops,phash', + usercount => '0,User Count', + users => '0,Users,parray', + version => '0,Version', + via_pc92 => '0,In via pc92?,yesno', ); $filterdef = $Route::filterdef; @@ -400,7 +401,7 @@ sub TO_JSON { return { %{ shift() } }; } sub write_cache { my $json = DXJSON->new; - $json->canonical(isdbg('routecache')); + $json->canonical(isdbg('routecache')||0); my $ta = [ gettimeofday ]; my @s; @@ -410,23 +411,38 @@ sub write_cache } }; if (!$@ && @s) { - my $fh = IO::File->new(">$cachefn") or confess("writing $cachefn $!"); - if (isdbg("routecache")) { - $fh->print(sort @s); - } - else { - $fh->print(@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 '$@'"); + 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"); + 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 {