From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] ds: make %AWAIT_PIDS a hash, not hashref
Date: Wed, 4 Oct 2023 08:50:58 +0000 [thread overview]
Message-ID: <20231004085059.2115839-4-e@80x24.org> (raw)
In-Reply-To: <20231004085059.2115839-1-e@80x24.org>
This is more persistent than some of the others and we don't
swap it on use (unlike $nextq or $ToClose). In other words,
it's helpful for communicating its lifetime expectancy is
close to %DescriptorMap and not like to queue-type things
such as $ToClose.
---
lib/PublicInbox/DS.pm | 15 ++++++++-------
lib/PublicInbox/LEI.pm | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 8f77b6ad..26cc83f0 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -39,7 +39,7 @@ our @EXPORT_OK = qw(now msg_more awaitpid add_timer add_uniq_timer);
my $nextq; # queue for next_tick
my $reap_armed;
my $ToClose; # sockets to close when event loop is done
-our ($AWAIT_PIDS, # pid => [ $callback, @args ]
+our (%AWAIT_PIDS, # pid => [ $callback, @args ]
$cur_runq, # only set inside next_tick
%DescriptorMap, # fd (num) -> PublicInbox::DS object
$Poller, # global Select, Epoll, DSPoll, or DSKQXS ref
@@ -80,9 +80,10 @@ sub Reset {
# we may be called from an *atfork_child inside next_tick:
@$cur_runq = () if $cur_runq;
- $AWAIT_PIDS = $nextq = $ToClose = undef; # may call ep_del
+ $nextq = $ToClose = undef; # may call ep_del
+ %AWAIT_PIDS = ();
$Poller = PublicInbox::Select->new;
- } while (@Timers || $nextq || $AWAIT_PIDS ||
+ } while (@Timers || $nextq || keys(%AWAIT_PIDS) ||
$ToClose || keys(%DescriptorMap) ||
@post_loop_do || keys(%UniqTimer) ||
scalar(@{$cur_runq // []})); # do not vivify cur_runq
@@ -218,7 +219,7 @@ sub reap_pids {
$reap_armed = undef;
while (1) {
my $pid = waitpid(-1, WNOHANG) or return;
- if (defined(my $cb_args = delete $AWAIT_PIDS->{$pid})) {
+ if (defined(my $cb_args = delete $AWAIT_PIDS{$pid})) {
await_cb($pid, @$cb_args) if $cb_args;
} elsif ($pid == -1 && $! == ECHILD) {
return requeue(\&dflush); # force @post_loop_do to run
@@ -719,17 +720,17 @@ sub long_response ($$;@) {
sub awaitpid {
my ($pid, @cb_args) = @_; # @cb_args = ($cb, @args), $cb may be undef
- $AWAIT_PIDS->{$pid} = \@cb_args if @cb_args;
+ $AWAIT_PIDS{$pid} = \@cb_args if @cb_args;
# provide synchronous API
if (defined(wantarray) || (!$in_loop && !@cb_args)) {
my $ret = waitpid($pid, 0);
if ($ret == $pid) {
- my $cb_args = delete $AWAIT_PIDS->{$pid};
+ my $cb_args = delete $AWAIT_PIDS{$pid};
@cb_args = @$cb_args if !@cb_args && $cb_args;
await_cb($pid, @cb_args);
} else {
carp "waitpid($pid) => $ret ($!)";
- delete $AWAIT_PIDS->{$pid};
+ delete $AWAIT_PIDS{$pid};
}
return $ret;
} elsif ($in_loop) { # We could've just missed our SIGCHLD, cover it, here:
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 5f3147bf..e300f0a4 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1302,7 +1302,7 @@ sub can_stay_alive { # PublicInbox::DS::post_loop_do cb
}
};
# returns true: continue, false: stop
- $n + scalar(keys(%$PublicInbox::DS::AWAIT_PIDS));
+ $n + scalar(keys(%PublicInbox::DS::AWAIT_PIDS));
}
# lei(1) calls this when it can't connect
prev parent reply other threads:[~2023-10-04 8:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 8:50 [PATCH 0/3] ds fix and cleanups Eric Wong
2023-10-04 8:50 ` [PATCH 1/3] ds: Reset: replace Poller object early Eric Wong
2023-10-04 8:50 ` [PATCH 2/3] ds: cleanup fork + Reset support Eric Wong
2023-10-04 8:50 ` Eric Wong [this message]
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=20231004085059.2115839-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.
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).