make investigate a bit faster by sending pings per interface

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e6f98c95197b106fd57430b0784f5c5a60144aed..d4d5491aaed7d24144ea21e195d691c10baa59c6 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -695,8 +695,9 @@ sub handle_16
        unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
                if (my $ivp = Investigate::get($ncall, $self->{call})) {
                        $ivp->store_pcxx($pcno,$line,$origin,@_);
+               } else {
+                       dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
                }
-               dbg("PCPROT: We don't believe $ncall on $self->{call}");
                return;
        }
 
@@ -848,8 +849,9 @@ sub handle_17
        unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
                if (my $ivp = Investigate::get($ncall, $self->{call})) {
                        $ivp->store_pcxx($pcno,$line,$origin,@_);
+               } else {
+                       dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
                }
-               dbg("PCPROT: We don't believe $ncall on $self->{call}");
                return;
        }
 
@@ -1005,7 +1007,7 @@ sub handle_19
                                $ivp->here($here);
                                $ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]);
                        } else {
-                               dbg("PCPROT: We don't believe $call on $self->{call}");
+                               dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr');
                        }
                        $user->put;
                        next;
@@ -1101,8 +1103,9 @@ sub handle_21
        unless ($call eq $self->{call} || $self->is_believed($call)) {
                if (my $ivp = Investigate::get($call, $self->{call})) {
                        $ivp->store_pcxx($pcno,$line,$origin,@_);
+               } else {
+                       dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr');
                }
-               dbg("PCPROT: We don't believe $call on $self->{call}");
                return;
        }
 
@@ -2455,7 +2458,7 @@ sub eph_dup
        $s =~ s/\^H\d\d?\^?\~?$//;
        $r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
        $eph{$s} = $main::systime + $t;
-       dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chan'); 
+       dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chanerr'); 
        return $r;
 }
 

diff --git a/perl/Investigate.pm b/perl/Investigate.pm
index d59a57b5a1ba17f976d2fe47660366076510e400..5fce74b652d4102bf201953e46529f55a186d82b 100644 (file)
--- a/perl/Investigate.pm
+++ b/perl/Investigate.pm
@@ -47,6 +47,7 @@ my $lastping = 0;                             # last ping done
                  pcxx => '0,Stored PCProt,parray',
                 );
 
+my %via = ();
 
 sub new
 {
@@ -87,6 +88,7 @@ sub handle_ping
        my $self = shift;
        dbg("Investigate: ping received for $self->{call} via $self->{via}") if isdbg('investigate');
        if ($self->{state} eq 'waitping') {
+               $via{$self->{via}} = 0;       # cue up next ping on this interface
                delete $list{"$self->{via},$self->{call}"};
                my $user = DXUser->get_current($self->{via});
                if ($user) {
@@ -120,11 +122,13 @@ sub process
 {
        while (my ($k, $v) = each %list) {
                if ($v->{state} eq 'start') {
-                       if ($main::systime > $lastping+$pingint) {
+                       my $v = $via{$v->{via}} || 0;
+                       if ($main::systime > $v+$pingint) {
                                DXProt::addping($main::mycall, $v->{call}, $v->{via});
                                $v->{start} = $lastping = $main::systime;
                                dbg("Investigate: ping sent to $v->{call} via $v->{via}") if isdbg('investigate');
                                $v->chgstate('waitping');
+                               $via{$v->{via}} = $main::systime;
                        }
                } elsif ($v->{state} eq 'waitping') {
                        if ($main::systime > $v->{start} + $maxpingwait) {