From: Eric Wong <e@80x24.org> 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 [thread overview] Message-ID: <20210203081143.24424-2-e@80x24.org> (raw) In-Reply-To: <20210203081143.24424-1-e@80x24.org> 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);
next prev parent reply other threads:[~2021-02-03 8:11 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-03 8:11 [PATCH 00/11] lei q --stdin, shortcut names, etc Eric Wong 2021-02-03 8:11 ` Eric Wong [this message] 2021-02-03 8:11 ` [PATCH 02/11] lei: further reduce lei2mail FD pressure Eric Wong 2021-02-03 8:11 ` [PATCH 03/11] pkt_op: rely on DS::in_loop global Eric Wong 2021-02-03 8:11 ` [PATCH 04/11] lei: err: avoid uninitialized variable warnings Eric Wong 2021-02-03 8:11 ` [PATCH 05/11] lei: propagate curl errors, improve internal consistency Eric Wong 2021-02-03 8:11 ` [PATCH 06/11] lei q: -I/--exclude/--only support globs and basenames Eric Wong 2021-02-03 8:11 ` [PATCH 07/11] lei: complete basenames for include|exclude|only Eric Wong 2021-02-03 8:11 ` [PATCH 08/11] lei: help starts pager Eric Wong 2021-02-03 8:11 ` [PATCH 09/11] lei add-external: completion for existing URL basenames Eric Wong 2021-02-03 8:11 ` [PATCH 10/11] lei: use sleep(1) loop for infinite sleep Eric Wong 2021-02-03 8:11 ` [PATCH 11/11] lei q: support reading queries from stdin 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: https://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=20210203081143.24424-2-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 01/11] lei: reduce FD pressure from lei2mail worker' \ /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
Code repositories for project(s) associated with this 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).