From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] inbox: fix periodic git process cleanup
Date: Sun, 15 Dec 2019 08:35:30 +0000 [thread overview]
Message-ID: <20191215083530.19728-1-e@80x24.org> (raw)
We need to use $PublicInbox::DS::in_loop instead of ::running().
The latter is not valid for systems with signalfd or kqueue and
is now gone, completely.
Not needing periodic cleanups at all to deal with unlinked pack
indices will be a tougher task...
---
lib/PublicInbox/DS.pm | 2 --
lib/PublicInbox/Inbox.pm | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 856884bb..62aa3c2d 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -255,8 +255,6 @@ sub reap_pids {
# reentrant SIGCHLD handler (since reap_pids is not reentrant)
sub enqueue_reap ($) { push @$nextq, \&reap_pids };
-sub running () { ($SIG{CHLD} // '') eq \&enqueue_reap }
-
sub EpollEventLoop {
local $in_loop = 1;
do {
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 43c6a428..f294c0d5 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -52,7 +52,7 @@ sub cleanup_task () {
sub cleanup_possible () {
# no need to require DS, here, if it were enabled another
# module would've require'd it, already
- eval { PublicInbox::DS::running() } or return 0;
+ eval { $PublicInbox::DS::in_loop } or return 0;
eval {
require Devel::Peek; # needs separate package in Fedora
reply other threads:[~2019-12-15 8:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20191215083530.19728-1-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).