projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove SIGCLD handling (not needed)
[spider.git]
/
perl
/
Msg.pm
diff --git
a/perl/Msg.pm
b/perl/Msg.pm
index aa5edc48bd4a8ba454005f3ff8c3e5df5f8fc7cf..f1f60edfb6f845e5e04604a41c1a49785380a33f 100644
(file)
--- a/
perl/Msg.pm
+++ b/
perl/Msg.pm
@@
-32,8
+32,9
@@
BEGIN {
eval {
require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
};
eval {
require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
};
- if ($@) {
+ 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;
print STDERR "POSIX Blocking enabled\n";
} else {
$blocking_supported = 1;
print STDERR "POSIX Blocking enabled\n";
@@
-195,7
+196,7
@@
sub disconnect {
$call ||= 'unallocated';
dbg('connll', "Connection $call disconnected");
$call ||= 'unallocated';
dbg('connll', "Connection $call disconnected");
- unless ($
^O =~ /^MS/i
) {
+ unless ($
main::is_win
) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
}
kill 'TERM', $conn->{pid} if exists $conn->{pid};
}
@@
-271,7
+272,10
@@
sub _send {
$conn->disconnect;
return 0; # fail. Message remains in queue ..
}
$conn->disconnect;
return 0; # fail. Message remains in queue ..
}
- }
+ } elsif (isdbg('raw')) {
+ my $call = $conn->{call} || 'none';
+ dbgdump('raw', "$call send $bytes_written: ", $msg);
+ }
$offset += $bytes_written;
$bytes_to_write -= $bytes_written;
}
$offset += $bytes_written;
$bytes_to_write -= $bytes_written;
}
@@
-373,6
+377,10
@@
sub _rcv { # Complement to _send
if (defined ($bytes_read)) {
if ($bytes_read > 0) {
$conn->{msg} .= $msg;
if (defined ($bytes_read)) {
if ($bytes_read > 0) {
$conn->{msg} .= $msg;
+ if (isdbg('raw')) {
+ my $call = $conn->{call} || 'none';
+ dbgdump('raw', "$call read $bytes_read: ", $msg);
+ }
}
} else {
if (_err_will_block($!)) {
}
} else {
if (_err_will_block($!)) {
@@
-481,7
+489,7
@@
sub event_loop {
# Quit the loop if no handles left to process
last unless ($rd_handles->count() || $wt_handles->count());
# Quit the loop if no handles left to process
last unless ($rd_handles->count() || $wt_handles->count());
- ($rset, $wset) = IO::Select->select($rd_handles, $wt_handles, $er_handles, $timeout);
+ ($rset, $wset
, $eset
) = IO::Select->select($rd_handles, $wt_handles, $er_handles, $timeout);
foreach $e (@$eset) {
&{$er_callbacks{$e}}($e) if exists $er_callbacks{$e};
foreach $e (@$eset) {
&{$er_callbacks{$e}}($e) if exists $er_callbacks{$e};