ds: don't pass FD map to post_loop_do callback

It's not used by any post_loop_do callbacks anymore, and the
underlying FD map is a global `our' variable accessible from
anywhere, anyways.

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index ecfb581d47d9cade363565ada0f5c724fba3fe85..d8824a55d640f0079295e88deb9b6d87dcdd8ea4 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -260,9 +260,7 @@ sub PostEventLoop () {
        }
 
        # by default we keep running, unless a postloop callback cancels it
-       @post_loop_do ?  $post_loop_do[0]->(\%DescriptorMap,
-                                       @post_loop_do[1..$#post_loop_do])
-                       : 1
+       @post_loop_do ? $post_loop_do[0]->(@post_loop_do[1..$#post_loop_do]) : 1
 }
 
 sub sigset_prep ($$$) {

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 5250610b52e931f65c0117c441ccf779a632d30d..e5755981084413eff46e091fb340c8c593a7c242 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -363,7 +363,6 @@ sub worker_quit { # $_[0] = signal name or number (unused)
        my $warn = 0;
        # drop idle connections and try to quit gracefully
        @PublicInbox::DS::post_loop_do = (sub {
-               my ($dmap, undef) = @_;
                my $now = now();
                my $n = PublicInbox::DS::close_non_busy();
                if ($n) {

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 9388befdac47ca88f04d3fccd64e624e1d22f1e7..9b4b15082021eff2b1b30ec501fb0f3514cff812 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -251,8 +251,8 @@ sub recv_and_run {
        $n;
 }
 
-sub sock_defined {
-       my (undef, $wqw) = @_;
+sub sock_defined { # PublicInbox::DS::post_loop_do CB
+       my ($wqw) = @_;
        defined($wqw->{sock});
 }
 

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 977a94c6df71ab8bdca66580c276630bec26894d..afed84c1b35e854d0b0ddd49de4ec464d39f9b99 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1355,7 +1355,6 @@ sub lazy_start {
        });
        $dir_idle->add_watches([$sock_dir]);
        local @PublicInbox::DS::post_loop_do = (sub {
-               my ($dmap, undef) = @_;
                if (@st = defined($path) ? stat($path) : ()) {
                        if ($dev_ino_expect ne pack('dd', $st[0], $st[1])) {
                                warn "$path dev/ino changed, quitting\n";