From: Dirk Koopman Date: Wed, 11 Jan 2023 14:41:36 +0000 (+0000) Subject: add better pc11->pc11 stats X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ea0cfddb331897b9b0b92cd576b0ab2e1e88bbd2;p=spider.git add better pc11->pc11 stats --- diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 50a6416e..8b8eba07 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -144,7 +144,9 @@ my $last; my $pc11_saved; my $pc11_saved_time; my $pc11_rx; +my $rpc11_to_61; my $pc11_to_61; +my $pc61_rx; # DX Spot handling sub handle_11 @@ -270,10 +272,13 @@ sub handle_11 unless ($recurse) { if ($pcno == 61) { + ++$pc61_rx; + if ($pc11_saved) { if ($key eq $pc11_saved->[0]) { ++$pc11_to_61; - dbg("recurse: $recurse saved PC11 spot $key dumped, better pc61 received pc11: $pc11_rx -> pc61 $pc11_to_61 ") if isdbg("pc11"); + my $percent = int($pc11_to_61 * 100 / $pc11_rx); + dbg("recurse: $recurse saved PC11 spot $key dumped, better pc61 received ($percent\%) pc61: $pc61_rx pc11: $pc11_rx -> pc61: $pc11_to_61 ") if isdbg("pc11"); undef $pc11_saved; } } @@ -294,8 +299,9 @@ sub handle_11 if ($r && $r->ip) { # do we have an ip addres $pcno = 61; # now turn this into a PC61 $spot[14] = $r->ip; - ++$pc11_to_61; - dbg("recurse: $recurse PC11 spot $key promoted to pc61 ip $spot[14] pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11"); + ++$rpc11_to_61; + my $percent = int($rpc11_to_61 * 100 / $pc11_rx); + dbg("recurse: $recurse PC11 spot $key promoted to pc61 ($percent\%) ip $spot[14] pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11"); undef $pc11_saved; } @@ -316,7 +322,7 @@ sub handle_11 } } else { - dbg("recurse: $recurse PC61 spot $key passed onward") if isdbg("pc11"); + dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11"); $recurse = 0; undef $pc11_saved; }