From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2D52F1F934 for ; Wed, 3 Feb 2021 08:11:44 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 01/11] lei: reduce FD pressure from lei2mail worker Date: Tue, 2 Feb 2021 22:11:33 -1000 Message-Id: <20210203081143.24424-2-e@80x24.org> In-Reply-To: <20210203081143.24424-1-e@80x24.org> References: <20210203081143.24424-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: lei2mail doesn't need stdin anymore, so we can use the [0] slot for the $not_done keepalive purposes. --- lib/PublicInbox/LeiOverview.pm | 8 ++++---- lib/PublicInbox/LeiToMail.pm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 52da225d..88034ada 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -217,13 +217,13 @@ sub ovv_each_smsg_cb { # runs in wq worker usually }; } elsif ($l2m && $l2m->{-wq_s1}) { my ($lei_ipc, @io) = $lei->atfork_parent_wq($l2m); - # $io[-1] becomes a notification pipe that triggers EOF + # $io[0] becomes a notification pipe that triggers EOF # in this wq worker when all outstanding ->write_mail # calls are complete - pipe($l2m->{each_smsg_done}, $io[$#io + 1]) or die "pipe: $!"; - fcntl($io[-1], 1031, 4096) if $^O eq 'linux'; # F_SETPIPE_SZ + $io[0] = undef; + pipe($l2m->{each_smsg_done}, $io[0]) or die "pipe: $!"; + fcntl($io[0], 1031, 4096) if $^O eq 'linux'; # F_SETPIPE_SZ delete @$lei_ipc{qw(l2m opt mset_opt cmd)}; - $lei_ipc->{each_smsg_not_done} = $#io; my $git = $ibxish->git; # (LeiXSearch|Inbox|ExtSearch)->git $self->{git} = $git; my $git_dir = $git->{git_dir}; diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index c6c5f84b..c704dc2a 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -464,7 +464,7 @@ sub post_augment { # fast (spawn compressor or mkdir), runs in main daemon sub write_mail { # via ->wq_do my ($self, $git_dir, $smsg, $lei) = @_; - my $not_done = delete $self->{$lei->{each_smsg_not_done}}; + my $not_done = delete $self->{0} // die 'BUG: $not_done missing'; my $wcb = $self->{wcb} //= do { # first message $lei->atfork_child_wq($self); $self->write_cb($lei);