projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add b to Aliases so 'b' means 'bye' and not blank
[spider.git]
/
perl
/
Msg.pm
diff --git
a/perl/Msg.pm
b/perl/Msg.pm
index 815937963962169d8fb2e4d8e0808cb8675bc2a4..3f52e39dfe8057d4fb202f364be81eb36567ceb3 100644
(file)
--- a/
perl/Msg.pm
+++ b/
perl/Msg.pm
@@
-11,12
+11,19
@@
package Msg;
use strict;
package Msg;
use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
use IO::Select;
use IO::Socket;
use DXDebug;
use Timer;
use IO::Select;
use IO::Socket;
use DXDebug;
use Timer;
-use vars qw(%rd_callbacks %wt_callbacks %er_callbacks $rd_handles $wt_handles $er_handles $now %conns $noconns $blocking_supported);
+use vars qw(%rd_callbacks %wt_callbacks %er_callbacks $rd_handles $wt_handles $er_handles $now %conns $noconns $blocking_supported
$cnum
);
%rd_callbacks = ();
%wt_callbacks = ();
%rd_callbacks = ();
%wt_callbacks = ();
@@
-33,11
+40,11
@@
BEGIN {
require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
};
if ($@ || $main::is_win) {
require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
};
if ($@ || $main::is_win) {
-
print STDERR "POSIX Blocking *** NOT *** supported $@\n";
+
#
print STDERR "POSIX Blocking *** NOT *** supported $@\n";
$blocking_supported = 0;
} else {
$blocking_supported = 1;
$blocking_supported = 0;
} else {
$blocking_supported = 1;
-
print STDERR "POSIX Blocking enabled\n";
+
#
print STDERR "POSIX Blocking enabled\n";
}
}
@@
-53,6
+60,8
@@
my $eagain = eval {EAGAIN()};
my $einprogress = eval {EINPROGRESS()};
my $ewouldblock = eval {EWOULDBLOCK()};
$^W = $w;
my $einprogress = eval {EINPROGRESS()};
my $ewouldblock = eval {EWOULDBLOCK()};
$^W = $w;
+$cnum = 0;
+
#
#-----------------------------------------------------------------
#
#-----------------------------------------------------------------
@@
-73,10
+82,12
@@
sub new
csort => 'telnet',
timeval => 60,
blocking => 0,
csort => 'telnet',
timeval => 60,
blocking => 0,
- cnum =>
++$noconns
,
+ cnum =>
(($cnum < 999) ? (++$cnum) : ($cnum = 1))
,
};
};
- dbg('connll', "Connection created ($noconns)");
+ $noconns++;
+
+ dbg("Connection created ($noconns)") if isdbg('connll');
return bless $conn, $class;
}
return bless $conn, $class;
}
@@
-118,10
+129,11
@@
sub conns
if (ref $pkg) {
$call = $pkg->{call} unless $call;
return undef unless $call;
if (ref $pkg) {
$call = $pkg->{call} unless $call;
return undef unless $call;
- confess "changing $pkg->{call} to $call" if exists $pkg->{call} && $call ne $pkg->{call};
+ dbg("changing $pkg->{call} to $call") if isdbg('connll') && exists $pkg->{call} && $call ne $pkg->{call};
+ delete $conns{$pkg->{call}} if exists $pkg->{call} && exists $conns{$pkg->{call}} && $pkg->{call} ne $call;
$pkg->{call} = $call;
$ref = $conns{$call} = $pkg;
$pkg->{call} = $call;
$ref = $conns{$call} = $pkg;
- dbg(
'connll', "Connection $pkg->{cnum} $call stored"
);
+ dbg(
"Connection $pkg->{cnum} $call stored") if isdbg('connll'
);
} else {
$ref = $conns{$call};
}
} else {
$ref = $conns{$call};
}
@@
-134,9
+146,9
@@
sub pid_gone
my ($pkg, $pid) = @_;
my @pid = grep {$_->{pid} == $pid} values %conns;
my ($pkg, $pid) = @_;
my @pid = grep {$_->{pid} == $pid} values %conns;
- for (@pid) {
- &{$
_->{eproc}}($_, "$pid has gorn") if exists $_
->{eproc};
- $
_
->disconnect;
+ for
each my $p
(@pid) {
+ &{$
p->{eproc}}($p, "$pid has gorn") if exists $p
->{eproc};
+ $
p
->disconnect;
}
}
}
}
@@
-194,7
+206,7
@@
sub disconnect {
delete $conns{$call} if $ref && $ref == $conn;
}
$call ||= 'unallocated';
delete $conns{$call} if $ref && $ref == $conn;
}
$call ||= 'unallocated';
- dbg(
'connll', "Connection $conn->{cnum} $call disconnected"
);
+ dbg(
"Connection $conn->{cnum} $call disconnected") if isdbg('connll'
);
unless ($main::is_win) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
unless ($main::is_win) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
@@
-282,13
+294,11
@@
sub _send {
delete $conn->{send_offset};
$offset = 0;
shift @$rq;
delete $conn->{send_offset};
$offset = 0;
shift @$rq;
- last unless $flush; # Go back to select and wait
+
#
last unless $flush; # Go back to select and wait
# for it to fire again.
}
# Call me back if queue has not been drained.
# for it to fire again.
}
# Call me back if queue has not been drained.
- if (@$rq) {
- set_event_handler ($sock, write => sub {$conn->_send(0)});
- } else {
+ unless (@$rq) {
set_event_handler ($sock, write => undef);
if (exists $conn->{close_on_empty}) {
&{$conn->{eproc}}($conn, undef) if exists $conn->{eproc};
set_event_handler ($sock, write => undef);
if (exists $conn->{close_on_empty}) {
&{$conn->{eproc}}($conn, undef) if exists $conn->{eproc};
@@
-395,7
+405,9
@@
FINISH:
&{$conn->{eproc}}($conn, $!) if exists $conn->{eproc};
$conn->disconnect;
} else {
&{$conn->{eproc}}($conn, $!) if exists $conn->{eproc};
$conn->disconnect;
} else {
- $conn->dequeue if exists $conn->{msg};
+ unless ($conn->{disable_read}) {
+ $conn->dequeue if exists $conn->{msg};
+ }
}
}
}
}
@@
-422,7
+434,7
@@
sub new_client {
$conn->disconnect();
}
} else {
$conn->disconnect();
}
} else {
- dbg(
'err', "Msg: error on accept ($!)"
);
+ dbg(
"Msg: error on accept ($!)") if isdbg('err'
);
}
}
}
}
@@
-436,11
+448,18
@@
sub close_server
# close all clients (this is for forking really)
sub close_all_clients
{
# close all clients (this is for forking really)
sub close_all_clients
{
- for (values %conns) {
- $
_
->disconnect;
+ for
each my $conn
(values %conns) {
+ $
conn
->disconnect;
}
}
}
}
+sub disable_read
+{
+ my $conn = shift;
+ set_event_handler ($conn->{sock}, read => undef);
+ return $_[0] ? $conn->{disable_read} = $_[0] : $_[0];
+}
+
#
#----------------------------------------------------
# Event loop routines used by both client and server
#
#----------------------------------------------------
# Event loop routines used by both client and server
@@
-524,7
+543,7
@@
sub DESTROY
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
- dbg(
'connll', "Connection $conn->{cnum} $call [$host $port] being destroyed"
);
+ dbg(
"Connection $conn->{cnum} $call [$host $port] being destroyed") if isdbg('connll'
);
$noconns--;
}
$noconns--;
}