From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id DB5B71F566 for ; Wed, 4 Oct 2023 03:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696391373; bh=AEXi/DiQ9bOOkPt7EMh34ljRw3no3vxmuWVPG08/zF8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=aENONw2rfQD49V+RzkhLaIbOGGcNuIYpuYxmZHlrEQLqV+H/JtwE9BxLkema6mT5W CehhAIgZieiAllSyZDaTBoCaglX6j3ufogij1LN76u3w1w5VpJ3jXe5yMwcuDSJxQN buGl7iyci3ArfC3vqo0bHPwHxXLIi09bNuSZeS0k= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 03/21] ds: don't pass FD map to post_loop_do callback Date: Wed, 4 Oct 2023 03:49:15 +0000 Message-ID: <20231004034933.3343930-4-e@80x24.org> In-Reply-To: <20231004034933.3343930-1-e@80x24.org> References: <20231004034933.3343930-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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. --- lib/PublicInbox/DS.pm | 4 +--- lib/PublicInbox/Daemon.pm | 1 - lib/PublicInbox/IPC.pm | 4 ++-- lib/PublicInbox/LEI.pm | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index ecfb581d..d8824a55 100644 --- 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 5250610b..e5755981 100644 --- 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 9388befd..9b4b1508 100644 --- 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 977a94c6..afed84c1 100644 --- 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";