diff options
| -rw-r--r-- | lib/PublicInbox/DSPoll.pm | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/Select.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/PublicInbox/DSPoll.pm b/lib/PublicInbox/DSPoll.pm index b947f756..a7055ec9 100644 --- a/lib/PublicInbox/DSPoll.pm +++ b/lib/PublicInbox/DSPoll.pm @@ -26,11 +26,9 @@ sub ep_wait { push(@pset, $fd, $pevents); } @$events = (); - do { - $n = IO::Poll::_poll($timeout_msec, @pset); - } while ($n < 0 && $! == Errno::EINTR); + $n = IO::Poll::_poll($timeout_msec, @pset) or return; # timeout expired + return if $n < 0 && $! == Errno::EINTR; # caller recalculates timeout die "poll: $!" if $n < 0; - return if $n == 0; while (defined($fd = shift @pset)) { $revents = shift @pset or next; # no event if ($revents & POLLNVAL) { diff --git a/lib/PublicInbox/Select.pm b/lib/PublicInbox/Select.pm index 5cb7aff3..face8edc 100644 --- a/lib/PublicInbox/Select.pm +++ b/lib/PublicInbox/Select.pm @@ -8,6 +8,7 @@ package PublicInbox::Select; use v5.12; use PublicInbox::Syscall qw(EPOLLONESHOT EPOLLIN EPOLLOUT); +use Errno; sub new { bless {}, __PACKAGE__ } # fd => events @@ -19,8 +20,9 @@ sub ep_wait { vec($wvec, $fd, 1) = 1 if $ev & EPOLLOUT; } @$events = (); - my $n = select($rvec, $wvec, undef, $msec < 0 ? undef : ($msec/1000)); - return if $n == 0; + my $to = $msec < 0 ? undef : ($msec/1000); + my $n = select $rvec, $wvec, undef, $to or return; # timeout expired + return if $n < 0 && $! == Errno::EINTR; # caller recalculates timeout die "select: $!" if $n < 0; while (my ($fd, $ev) = each %$self) { if (vec($rvec, $fd, 1) || vec($wvec, $fd, 1)) { |