move all non-test @post_loop_do into named subs

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).

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index e5755981084413eff46e091fb340c8c593a7c242..a4c99ccac914740f7e7b1bbdb717e3cc83d3d4d6 100644 (file)
--- 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 afed84c1b35e854d0b0ddd49de4ec464d39f9b99..74a7f5b92288e5286334ede71ac955c1ef7f8d55 100644 (file)
--- 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 cf0720e3283b36ffbf92851a8c9d5dc5aff4327a..3426d4a7f7c02ad4f7a0dc7149f15cf5d486f29f 100644 (file)
--- 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);
 }