From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 10/11] ds: avoid unnecessary timer for waitpid
Date: Mon, 31 Aug 2020 04:41:39 +0000 [thread overview]
Message-ID: <20200831044140.17027-11-e@80x24.org> (raw)
In-Reply-To: <20200831044140.17027-1-e@80x24.org>
It doesn't seem necessary, since we won't call dwaitpid()
until we see an EOF.
---
lib/PublicInbox/DS.pm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index b252ea3c..661be1fd 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -40,7 +40,7 @@ my $wait_pids; # list of [ pid, callback, callback_arg ]
my $later_queue; # list of callbacks to run at some later interval
my $EXPMAP; # fd -> idle_time
our $EXPTIME = 180; # 3 minutes
-my ($later_timer, $reap_armed, $reap_timer, $exp_timer);
+my ($later_timer, $reap_armed, $exp_timer);
my $ToClose; # sockets to close when event loop is done
our (
%DescriptorMap, # fd (num) -> PublicInbox::DS object
@@ -70,7 +70,7 @@ sub Reset {
%DescriptorMap = ();
$in_loop = $wait_pids = $later_queue = $reap_armed = undef;
$EXPMAP = {};
- $nextq = $ToClose = $reap_timer = $later_timer = $exp_timer = undef;
+ $nextq = $ToClose = $later_timer = $exp_timer = undef;
$LoopTimeout = -1; # no timeout by default
@Timers = ();
@@ -240,14 +240,7 @@ sub reap_pids {
}
}
# we may not be done, yet, and could've missed/masked a SIGCHLD:
- if ($wait_pids && !$reap_armed) {
- $reap_timer //= add_timer(1, \&reap_pids_timed);
- }
-}
-
-sub reap_pids_timed {
- $reap_timer = undef;
- goto \&reap_pids;
+ $reap_armed //= requeue(\&reap_pids) if $wait_pids;
}
# reentrant SIGCHLD handler (since reap_pids is not reentrant)
next prev parent reply other threads:[~2020-08-31 4:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 4:41 [PATCH 00/11] watch: fix contention w/ Maildir & NNTP Eric Wong
2020-08-31 4:41 ` [PATCH 01/11] watch: limit batch size of NNTP and IMAP workers, too Eric Wong
2020-08-31 4:41 ` [PATCH 02/11] watchmaildir: use v5.10.1, drop warnings Eric Wong
2020-08-31 4:41 ` [PATCH 03/11] rename WatchMaildir => Watch Eric Wong
2020-08-31 4:41 ` [PATCH 04/11] watch: log signal activities to STDERR Eric Wong
2020-08-31 4:41 ` [PATCH 05/11] watch: avoid unnecessary spawning on spam removals Eric Wong
2020-08-31 4:41 ` [PATCH 06/11] watch: block signals before fork on non-signalfd/kevent systems Eric Wong
2020-08-31 4:41 ` [PATCH 07/11] watch: comments and tiny cleanups Eric Wong
2020-08-31 4:41 ` [PATCH 08/11] ds: avoid excessive queueing when reaping PIDs Eric Wong
2020-08-31 4:41 ` [PATCH 09/11] watch: use EOFpipe to reduce dwaitpid wakeups Eric Wong
2020-08-31 4:41 ` Eric Wong [this message]
2020-08-31 4:41 ` [PATCH 11/11] replace ParentPipe with EOFpipe 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=20200831044140.17027-11-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).