From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C70AF1F461 for ; Sat, 25 Nov 2023 20:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1700945675; bh=oVp0+MkGKNepyfuUEQ7blHfGSyFTYTGCzhtE/N7csdI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZGp6Seys2y7mfzhIqEhYJVb2olNYCyZkjDOg3b+5SJoHVjqxbmOEnLXR4eFt8NZyl C6IAj9wcAQUvHaU15zhiaV2/J6qjrc54J8RjjftHbNqCizbBlfOzd/eeasKRSEtlMU 66docBX0zW9CxlJ07PTHSjeY0zbtqLd4QApYqqPo= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/3] select+poll: have caller retry on EINTR Date: Sat, 25 Nov 2023 20:54:34 +0000 Message-ID: <20231125205435.4187895-3-e@80x24.org> In-Reply-To: <20231125205435.4187895-1-e@80x24.org> References: <20231125205435.4187895-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can't assume signals are blocked when neither signalfd nor EVFILT_SIGNAL are in use. So just return an empty result so the caller can recalculate the timeout. I found this bug while making xt/httpd-async-stream.t use our event loop to reap processes but have abandoned that effort for now since it didn't save any code. --- lib/PublicInbox/DSPoll.pm | 6 ++---- 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)) {