From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 04/21] move all non-test @post_loop_do into named subs
Date: Wed, 4 Oct 2023 03:49:16 +0000 [thread overview]
Message-ID: <20231004034933.3343930-5-e@80x24.org> (raw)
In-Reply-To: <20231004034933.3343930-1-e@80x24.org>
Compared to Danga::Socket, our @post_loop_do API is designed to
make it easier to avoid anonymous subs (and their potential for
leaks in buggy old versions of Perl).
---
lib/PublicInbox/Daemon.pm | 38 ++++++++++++++++--------------
lib/PublicInbox/LEI.pm | 49 ++++++++++++++++++++-------------------
lib/PublicInbox/Watch.pm | 4 +++-
3 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index e5755981..a4c99cca 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -353,31 +353,33 @@ EOF
bless { pid => $$, pid_file => \$pid_file }, __PACKAGE__;
}
+sub has_busy_clients { # post_loop_do CB
+ my ($state) = @_;
+ my $now = now();
+ my $n = PublicInbox::DS::close_non_busy();
+ if ($n) {
+ if ($state->{-w} < now()) {
+ warn "$$ quitting, $n client(s) left\n";
+ $state->{-w} = now() + 5;
+ }
+ unless (defined $state->{0}) {
+ $state->{0} = (split(/\s+/, $0))[0];
+ $state->{0} =~ s!\A.*?([^/]+)\z!$1!;
+ }
+ $0 = "$state->{0} quitting, $n client(s) left";
+ }
+ $n; # true: loop continues, false: loop breaks
+}
+
sub worker_quit { # $_[0] = signal name or number (unused)
# killing again terminates immediately:
exit unless @listeners;
$_->close foreach @listeners; # call PublicInbox::DS::close
@listeners = ();
- my $proc_name;
- my $warn = 0;
+
# drop idle connections and try to quit gracefully
- @PublicInbox::DS::post_loop_do = (sub {
- my $now = now();
- my $n = PublicInbox::DS::close_non_busy();
- if ($n) {
- if (($warn + 5) < now()) {
- warn "$$ quitting, $n client(s) left\n";
- $warn = now();
- }
- unless (defined $proc_name) {
- $proc_name = (split(/\s+/, $0))[0];
- $proc_name =~ s!\A.*?([^/]+)\z!$1!;
- }
- $0 = "$proc_name quitting, $n client(s) left";
- }
- $n; # true: loop continues, false: loop breaks
- });
+ @PublicInbox::DS::post_loop_do = (\&has_busy_clients, { -w => 0 })
}
sub reopen_logs {
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index afed84c1..74a7f5b9 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1271,13 +1271,30 @@ sub dir_idle_handler ($) { # PublicInbox::DirIdle callback
}
}
-sub drop_all_stores () {
- for my $cfg (values %PATH2CFG) {
- my $sto = delete($cfg->{-lei_store}) // next;
- eval { $sto->wq_io_do('done') };
- warn "E: $@ (dropping store for $cfg->{-f})" if $@;
- $sto->wq_close;
+sub can_stay_alive { # PublicInbox::DS::post_loop_do cb
+ my ($path, $dev_ino_expect) = @_;
+ if (my @st = defined($$path) ? stat($$path) : ()) {
+ if ($dev_ino_expect ne pack('dd', $st[0], $st[1])) {
+ warn "$$path dev/ino changed, quitting\n";
+ $$path = undef;
+ }
+ } elsif (defined($$path)) { # ENOENT is common
+ warn "stat($$path): $!, quitting ...\n" if $! != ENOENT;
+ undef $$path;
+ $quit->();
}
+ return 1 if defined($$path);
+ my $n = PublicInbox::DS::close_non_busy() or do {
+ # drop stores only if no clients
+ for my $cfg (values %PATH2CFG) {
+ my $sto = delete($cfg->{-lei_store}) // next;
+ eval { $sto->wq_io_do('done') };
+ warn "E: $@ (dropping store for $cfg->{-f})" if $@;
+ $sto->wq_close;
+ }
+ };
+ # returns true: continue, false: stop
+ $n + scalar(keys(%$PublicInbox::DS::AWAIT_PIDS));
}
# lei(1) calls this when it can't connect
@@ -1354,24 +1371,8 @@ sub lazy_start {
dir_idle_handler($_[0]) if $_[0]->fullname ne $path;
});
$dir_idle->add_watches([$sock_dir]);
- local @PublicInbox::DS::post_loop_do = (sub {
- if (@st = defined($path) ? stat($path) : ()) {
- if ($dev_ino_expect ne pack('dd', $st[0], $st[1])) {
- warn "$path dev/ino changed, quitting\n";
- $path = undef;
- }
- } elsif (defined($path)) { # ENOENT is common
- warn "stat($path): $!, quitting ...\n" if $! != ENOENT;
- undef $path;
- $quit->();
- }
- return 1 if defined($path);
- 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));
- });
-
+ local @PublicInbox::DS::post_loop_do = (\&can_stay_alive,
+ \$path, $dev_ino_expect);
# STDIN was redirected to /dev/null above, closing STDERR and
# STDOUT will cause the calling `lei' client process to finish
# reading the <$daemon> pipe.
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index cf0720e3..3426d4a7 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -533,6 +533,8 @@ sub watch_nntp_init ($$) {
}
}
+sub quit_inprogress { !$_[0]->quit_done } # post_loop_do CB
+
sub watch { # main entry point
my ($self, $sig) = @_;
my $first_sig;
@@ -545,7 +547,7 @@ sub watch { # main entry point
add_timer(0, \&poll_fetch_fork, $self, $intvl, $uris);
}
watch_fs_init($self) if $self->{mdre};
- local @PublicInbox::DS::post_loop_do = (sub { !$self->quit_done });
+ local @PublicInbox::DS::post_loop_do = (\&quit_inprogress, $self);
PublicInbox::DS::event_loop($first_sig); # calls ->event_step
_done_for_now($self);
}
next prev parent reply other threads:[~2023-10-04 3:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 3:49 [PATCH 00/21] lei + IPC related stuff Eric Wong
2023-10-04 3:49 ` [PATCH 01/21] lei: drop stores explicitly at daemon shutdown Eric Wong
2023-10-04 3:49 ` [PATCH 02/21] ds: hoist out close_non_busy Eric Wong
2023-10-04 3:49 ` [PATCH 03/21] ds: don't pass FD map to post_loop_do callback Eric Wong
2023-10-04 3:49 ` Eric Wong [this message]
2023-10-04 3:49 ` [PATCH 05/21] lei: close DirIdle (inotify) early at daemon shutdown Eric Wong
2023-10-04 3:49 ` [PATCH 06/21] input_pipe: {args} is never undefined Eric Wong
2023-10-04 3:49 ` [PATCH 07/21] lei: do_env combines fchdir and local Eric Wong
2023-10-04 3:49 ` [PATCH 08/21] lei: get rid of l2m_progress PktOp callback Eric Wong
2023-10-04 3:49 ` [PATCH 09/21] t/lei_to_mail: modernize and document test Eric Wong
2023-10-04 3:49 ` [PATCH 10/21] lei: reuse PublicInbox::Config::noop Eric Wong
2023-10-04 3:49 ` [PATCH 11/21] lei: keep signals blocked on daemon shutdown Eric Wong
2023-10-04 3:49 ` [PATCH 12/21] mbox_lock: retry on EINTR and use autodie Eric Wong
2023-10-04 3:49 ` [PATCH 13/21] lock: retry on EINTR, improve error reporting Eric Wong
2023-10-04 3:49 ` [PATCH 14/21] treewide: use PublicInbox::Lock->new Eric Wong
2023-10-04 3:49 ` [PATCH 15/21] gcf2: use PublicInbox::Lock Eric Wong
2023-10-04 3:49 ` [PATCH 16/21] spawn: use autodie and PublicInbox::Lock Eric Wong
2023-10-04 3:49 ` [PATCH 17/21] xap_helper: retry flock on EINTR Eric Wong
2023-10-04 3:49 ` [PATCH 18/21] xap_helper.pm: use EINTR-aware recv_cmd Eric Wong
2023-10-04 3:49 ` [PATCH 19/21] spawn: drop checks for directory writability Eric Wong
2023-10-04 3:49 ` [PATCH 20/21] lei: document and local-ize $OPT hashref Eric Wong
2023-10-04 3:49 ` [PATCH 21/21] searchidx: fix redundant `in' in warning message 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: http://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=20231004034933.3343930-5-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).