From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/4] ds: improve error handling of synchronous awaitpid
Date: Thu, 19 Jan 2023 20:32:36 +0000 [thread overview]
Message-ID: <20230119203237.2277543-4-e@80x24.org> (raw)
In-Reply-To: <20230119203237.2277543-1-e@80x24.org>
EINTR needs to be retried for non-kqueue|signalfd users,
and ECHILD indicates a bug in our code.
---
lib/PublicInbox/DS.pm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index c849f515..523d47e4 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -30,7 +30,7 @@ use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use Scalar::Util qw(blessed);
use PublicInbox::Syscall qw(:epoll);
use PublicInbox::Tmpfile;
-use Errno qw(EAGAIN EINVAL);
+use Errno qw(EAGAIN EINVAL ECHILD EINTR);
use Carp qw(carp croak);
our @EXPORT_OK = qw(now msg_more awaitpid add_timer add_uniq_timer);
@@ -703,13 +703,19 @@ sub awaitpid {
$AWAIT_PIDS->{$pid} //= @cb_args ? \@cb_args : 0;
# provide synchronous API
if (defined(wantarray) || (!$in_loop && !@cb_args)) {
- my $ret = waitpid($pid, 0) // -2;
+ my $ret;
+again:
+ $ret = waitpid($pid, 0) // -2;
if ($ret == $pid) {
my $cb_args = delete $AWAIT_PIDS->{$pid};
@cb_args = @$cb_args if !@cb_args && $cb_args;
await_cb($pid, @cb_args);
- return $ret;
+ } else {
+ goto again if $! == EINTR;
+ carp "waitpid($pid): $!";
+ delete $AWAIT_PIDS->{$pid};
}
+ return $ret;
}
# We could've just missed our SIGCHLD, cover it, here:
enqueue_reap() if $in_loop;
next prev parent reply other threads:[~2023-01-19 20:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 20:32 [PATCH 0/4] qspawn|awaitpid error handling improvements Eric Wong
2023-01-19 20:32 ` [PATCH 1/4] qspawn: {quiet} only affects normal command exit Eric Wong
2023-01-19 20:32 ` [PATCH 2/4] qspawn: psgi_qx: do not call async_pass on errors Eric Wong
2023-01-19 20:32 ` Eric Wong [this message]
2023-01-19 20:32 ` [PATCH 4/4] qspawn: drop unnecessary awaitpid import Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119203237.2277543-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).