* [PATCH 2/3] select+poll: have caller retry on EINTR
2023-11-25 20:54 5% [PATCH 0/3] ds: event loop-related fixes Eric Wong
@ 2023-11-25 20:54 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-11-25 20:54 UTC (permalink / raw)
To: meta
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)) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] ds: event loop-related fixes
@ 2023-11-25 20:54 5% Eric Wong
2023-11-25 20:54 7% ` [PATCH 2/3] select+poll: have caller retry on EINTR Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-11-25 20:54 UTC (permalink / raw)
To: meta
Eric Wong (3):
http: fix HTTP/1.1 pipelining during long async requests
select+poll: have caller retry on EINTR
ds: long_step: eliminate redundant fileno call
lib/PublicInbox/DS.pm | 1 -
lib/PublicInbox/DSPoll.pm | 6 ++--
lib/PublicInbox/HTTP.pm | 17 +++++-----
lib/PublicInbox/Select.pm | 6 ++--
xt/httpd-async-stream.t | 68 +++++++++++++++++++++++++++++----------
5 files changed, 65 insertions(+), 33 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-25 20:54 5% [PATCH 0/3] ds: event loop-related fixes Eric Wong
2023-11-25 20:54 7% ` [PATCH 2/3] select+poll: have caller retry on EINTR Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).