* [PATCH 08/11] ds: rely on autovivication for waitpid bits
2020-01-12 21:17 7% [PATCH 00/11] ds: various cleanups and fixes Eric Wong
@ 2020-01-12 21:17 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-12 21:17 UTC (permalink / raw)
To: meta
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 () {
^ permalink raw reply related [relevance 6%]
* [PATCH 00/11] ds: various cleanups and fixes
@ 2020-01-12 21:17 7% Eric Wong
2020-01-12 21:17 6% ` [PATCH 08/11] ds: rely on autovivication for waitpid bits Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-12 21:17 UTC (permalink / raw)
To: meta
Start taking advantage of autovivification to simplify our code
and reduce allocations. Also, I believe it's my first time
using the return value of "push".
Eric Wong (11):
ds: new: avoid redundant check, make clobbering fatal
ds: add_timer: rename from AddTimer, remove a parameter
ds: add an in_loop() function for Inbox.pm use
ds: remove Timer->cancel and Timer class+bless
ds: PostEventLoop: guard ToClose against DESTROY side-effects
ds|http|nntp: simplify {wbuf} population
ds: rely on autovivification for nextq
ds: rely on autovivication for waitpid bits
ds: rely on autovivification for $later_queue
ds: flatten $EXPMAP, delete entries on close
sigfd: simplify loop and improve documentation
lib/PublicInbox/DS.pm | 200 +++++++++++++++++----------------------
lib/PublicInbox/HTTP.pm | 6 +-
lib/PublicInbox/Inbox.pm | 2 +-
lib/PublicInbox/NNTP.pm | 11 +--
lib/PublicInbox/Sigfd.pm | 13 +--
t/ds-leak.t | 2 +-
6 files changed, 105 insertions(+), 129 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-12 21:17 7% [PATCH 00/11] ds: various cleanups and fixes Eric Wong
2020-01-12 21:17 6% ` [PATCH 08/11] ds: rely on autovivication for waitpid bits 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).