* [PATCH 02/21] ds: hoist out close_non_busy
2023-10-04 3:49 6% [PATCH 00/21] lei + IPC related stuff Eric Wong
@ 2023-10-04 3:49 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-10-04 3:49 UTC (permalink / raw)
To: meta
It's shared by both by lei and public-facing daemons in using
the ->busy callback.
---
lib/PublicInbox/DS.pm | 10 ++++++++++
lib/PublicInbox/Daemon.pm | 10 +---------
lib/PublicInbox/LEI.pm | 12 ++----------
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index c476311b..ecfb581d 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -233,6 +233,16 @@ sub enqueue_reap () { $reap_armed //= requeue(\&reap_pids) }
sub in_loop () { $in_loop }
+# use inside @post_loop_do, returns number of busy clients
+sub close_non_busy () {
+ my $n = 0;
+ for my $s (values %DescriptorMap) {
+ # close as much as possible, early as possible
+ ($s->busy ? ++$n : $s->close) if $s->can('busy');
+ }
+ $n;
+}
+
# Internal function: run the post-event callback, send read events
# for pushed-back data, and close pending connections. returns 1
# if event loop should continue, or 0 to shut it all down.
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 7546105e..5250610b 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -364,16 +364,8 @@ sub worker_quit { # $_[0] = signal name or number (unused)
# drop idle connections and try to quit gracefully
@PublicInbox::DS::post_loop_do = (sub {
my ($dmap, undef) = @_;
- my $n = 0;
my $now = now();
- for my $s (values %$dmap) {
- $s->can('busy') or next;
- if ($s->busy) {
- ++$n;
- } else { # close as much as possible, early as possible
- $s->close;
- }
- }
+ my $n = PublicInbox::DS::close_non_busy();
if ($n) {
if (($warn + 5) < now()) {
warn "$$ quitting, $n client(s) left\n";
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 368eee26..977a94c6 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1367,16 +1367,8 @@ sub lazy_start {
$quit->();
}
return 1 if defined($path);
- my $n = 0;
- for my $s (values %$dmap) {
- $s->can('busy') or next;
- if ($s->busy) {
- ++$n;
- } else {
- $s->close;
- }
- }
- drop_all_stores() if !$n; # drop stores only if no clients
+ my $n = PublicInbox::DS::close_non_busy() or
+ drop_all_stores(); # drop stores only if no clients
# returns true: continue, false: stop
$n + scalar(keys(%$PublicInbox::DS::AWAIT_PIDS));
});
^ permalink raw reply related [relevance 7%]
* [PATCH 00/21] lei + IPC related stuff
@ 2023-10-04 3:49 6% Eric Wong
2023-10-04 3:49 7% ` [PATCH 02/21] ds: hoist out close_non_busy Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-10-04 3:49 UTC (permalink / raw)
To: meta
More work coming to make internal IPC stuff simpler
and better layered for future enhancements
(FUSE, increase xap_helper usage internally, etc).
Eric Wong (21):
lei: drop stores explicitly at daemon shutdown
ds: hoist out close_non_busy
ds: don't pass FD map to post_loop_do callback
move all non-test @post_loop_do into named subs
lei: close DirIdle (inotify) early at daemon shutdown
input_pipe: {args} is never undefined
lei: do_env combines fchdir and local
lei: get rid of l2m_progress PktOp callback
t/lei_to_mail: modernize and document test
lei: reuse PublicInbox::Config::noop
lei: keep signals blocked on daemon shutdown
mbox_lock: retry on EINTR and use autodie
lock: retry on EINTR, improve error reporting
treewide: use PublicInbox::Lock->new
gcf2: use PublicInbox::Lock
spawn: use autodie and PublicInbox::Lock
xap_helper: retry flock on EINTR
XapHelper.pm: use EINTR-aware recv_cmd wrapper
spawn: drop checks for directory writability
lei: document and local-ize $OPT hashref
searchidx: fix redundant `in' in warning message
lib/PublicInbox/DS.pm | 17 +++--
lib/PublicInbox/Daemon.pm | 47 ++++++-------
lib/PublicInbox/DirIdle.pm | 12 +++-
lib/PublicInbox/Gcf2.pm | 8 ++-
lib/PublicInbox/IPC.pm | 4 +-
lib/PublicInbox/InputPipe.pm | 11 ++-
lib/PublicInbox/LEI.pm | 127 ++++++++++++++++------------------
lib/PublicInbox/LeiAuth.pm | 4 +-
lib/PublicInbox/LeiConfig.pm | 25 +++----
lib/PublicInbox/LeiConvert.pm | 7 +-
lib/PublicInbox/LeiInspect.pm | 28 ++++----
lib/PublicInbox/LeiLcat.pm | 17 +++--
lib/PublicInbox/LeiMirror.pm | 2 +-
lib/PublicInbox/LeiQuery.pm | 19 +++--
lib/PublicInbox/LeiTag.pm | 6 +-
lib/PublicInbox/LeiToMail.pm | 20 +++---
lib/PublicInbox/LeiXSearch.pm | 113 +++++++++++++-----------------
lib/PublicInbox/Lock.pm | 52 ++++++++------
lib/PublicInbox/MboxLock.pm | 49 ++++++-------
lib/PublicInbox/PktOp.pm | 15 ++--
lib/PublicInbox/SearchIdx.pm | 2 +-
lib/PublicInbox/Spawn.pm | 32 ++++-----
lib/PublicInbox/TestCommon.pm | 7 +-
lib/PublicInbox/Watch.pm | 4 +-
lib/PublicInbox/XapHelper.pm | 11 ++-
lib/PublicInbox/xap_helper.h | 6 +-
t/lei-tag.t | 3 +
t/lei_to_mail.t | 37 +++++-----
t/solver_git.t | 3 +-
t/v2mirror.t | 2 +-
30 files changed, 339 insertions(+), 351 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-10-04 3:49 6% [PATCH 00/21] lei + IPC related stuff Eric Wong
2023-10-04 3:49 7% ` [PATCH 02/21] ds: hoist out close_non_busy 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).