Merge branch 'test' into mojo

[spider.git] / perl / EphMsg.pm

diff --git a/perl/EphMsg.pm b/perl/EphMsg.pm
index a6da8a2df2b54962f69dfa8e6e0c0a1726f52277..3117aabaee61aba69c9d187fffc35e0635b21742 100644 (file)
--- a/perl/EphMsg.pm
+++ b/perl/EphMsg.pm
@@ -18,6 +18,8 @@ use Msg;
 use DXVars;
 use DXUtil;
 use DXDebug;
+use DXTimer;
+
 use IO::File;
 use IO::Socket;
 use IPC::Open3;
@@ -61,6 +63,8 @@ sub dequeue
                        $conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
                }
 
+               $conn->{linesin} += @lines;
+               $Msg::total_lines_in += @lines;
                while (defined ($msg = shift @lines)) {
                        dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
 
@@ -71,19 +75,6 @@ sub dequeue
        }
 }
 
-sub to_connected
-{
-       my ($conn, $call, $dir, $sort) = @_;
-       $conn->{state} = 'C';
-       $conn->conns($call);
-       delete $conn->{cmd};
-       $conn->{timeout}->del if $conn->{timeout};
-       delete $conn->{timeout};
-       $conn->nolinger;
-       &{$conn->{rproc}}($conn, "$dir$call|$sort");
-}
-
-
 sub start_connect
 {
        my $call = shift;
@@ -140,7 +131,7 @@ sub _dotimeout
        dbg("connect $conn->{cnum}: timeout set to $val") if isdbg('connect');
        $conn->{timeout}->del if $conn->{timeout};
        $conn->{timeval} = $val;
-       $conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
+       $conn->{timeout} = DXTimer->new($val, sub{ &_timedout($conn) });
 }