From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 08/11] ds: rely on autovivication for waitpid bits
Date: Sun, 12 Jan 2020 21:17:53 +0000 [thread overview]
Message-ID: <20200112211756.23100-9-e@yhbt.net> (raw)
In-Reply-To: <20200112211756.23100-1-e@yhbt.net>
No need to create an arrayref until we need it, and fix up a
comment while we're in the area. Some aesthetic changes while
we're at it:
- Rename $WaitPids to $wait_pids to make it clear this is
unique to our implementation and not in Danga::Socket.
- rewrite dwaitpid() to reduce indentation level
---
lib/PublicInbox/DS.pm | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index ac9065f2..a78037f6 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -39,7 +39,7 @@ use Errno qw(EAGAIN EINVAL);
use Carp qw(confess carp);
my $nextq; # queue for next_tick
-my $WaitPids; # list of [ pid, callback, callback_arg ]
+my $wait_pids; # list of [ pid, callback, callback_arg ]
my $later_queue; # callbacks
my $EXPMAP; # fd -> [ idle_time, $self ]
our $EXPTIME = 180; # 3 minutes
@@ -71,7 +71,7 @@ Reset all state
=cut
sub Reset {
%DescriptorMap = ();
- $WaitPids = [];
+ $wait_pids = undef;
$later_queue = [];
$EXPMAP = {};
$nextq = $ToClose = $reap_timer = $later_timer = $exp_timer = undef;
@@ -226,25 +226,23 @@ sub RunTimers {
}
# We can't use waitpid(-1) safely here since it can hit ``, system(),
-# and other things. So we scan the $WaitPids list, which is hopefully
-# not too big.
+# and other things. So we scan the $wait_pids list, which is hopefully
+# not too big. We keep $wait_pids small by not calling dwaitpid()
+# until we've hit EOF when reading the stdout of the child.
sub reap_pids {
- my $tmp = $WaitPids;
- $WaitPids = [];
- $reap_timer = undef;
+ my $tmp = $wait_pids or return;
+ $wait_pids = $reap_timer = undef;
foreach my $ary (@$tmp) {
my ($pid, $cb, $arg) = @$ary;
my $ret = waitpid($pid, WNOHANG);
if ($ret == 0) {
- push @$WaitPids, $ary;
+ push @$wait_pids, $ary; # autovivifies @$wait_pids
} elsif ($cb) {
eval { $cb->($arg, $pid) };
}
}
- if (@$WaitPids) {
- # we may not be donea, and we may miss our
- $reap_timer = add_timer(1, \&reap_pids);
- }
+ # we may not be done, yet, and could've missed/masked a SIGCHLD:
+ $reap_timer = add_timer(1, \&reap_pids) if $wait_pids;
}
# reentrant SIGCHLD handler (since reap_pids is not reentrant)
@@ -626,15 +624,11 @@ sub shutdn ($) {
# must be called with eval, PublicInbox::DS may not be loaded (see t/qspawn.t)
sub dwaitpid ($$$) {
- my ($pid, $cb, $arg) = @_;
- if ($in_loop) {
- push @$WaitPids, [ $pid, $cb, $arg ];
+ die "Not in EventLoop\n" unless $in_loop;
+ push @$wait_pids, [ @_ ]; # [ $pid, $cb, $arg ]
- # We could've just missed our SIGCHLD, cover it, here:
- requeue(\&reap_pids);
- } else {
- die "Not in EventLoop\n";
- }
+ # We could've just missed our SIGCHLD, cover it, here:
+ requeue(\&reap_pids);
}
sub _run_later () {
next prev parent reply other threads:[~2020-01-12 21:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-12 21:17 [PATCH 00/11] ds: various cleanups and fixes Eric Wong
2020-01-12 21:17 ` [PATCH 01/11] ds: new: avoid redundant check, make clobbering fatal Eric Wong
2020-01-12 21:17 ` [PATCH 02/11] ds: add_timer: rename from AddTimer, remove a parameter Eric Wong
2020-01-12 21:17 ` [PATCH 03/11] ds: add an in_loop() function for Inbox.pm use Eric Wong
2020-01-12 21:17 ` [PATCH 04/11] ds: remove Timer->cancel and Timer class+bless Eric Wong
2020-01-12 21:17 ` [PATCH 05/11] ds: guard ToClose against DESTROY side-effects Eric Wong
2020-01-12 21:17 ` [PATCH 06/11] ds|http|nntp: simplify {wbuf} population Eric Wong
2020-01-12 21:17 ` [PATCH 07/11] ds: rely on autovivification for nextq Eric Wong
2020-01-12 21:17 ` Eric Wong [this message]
2020-01-12 21:17 ` [PATCH 09/11] ds: rely on autovivification for $later_queue Eric Wong
2020-01-12 21:17 ` [PATCH 10/11] ds: flatten $EXPMAP, delete entries on close Eric Wong
2020-01-12 21:17 ` [PATCH 11/11] sigfd: simplify loop and improve documentation 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=20200112211756.23100-9-e@yhbt.net \
--to=e@yhbt.net \
--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).