From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 09/12] lei_xsearch: reduce reference paths to lxs Date: Thu, 21 Jan 2021 19:46:21 +0000 [thread overview] Message-ID: <20210121194624.32002-10-e@80x24.org> (raw) In-Reply-To: <20210121194624.32002-1-e@80x24.org> Having an extra reference to LeiXSearch from the OpPipe $done_op map is unnecessary and makes the reference graph more complex than it needs to be. Just use $lei->{lxs} to simplify and reduce the likelyhood of bugs. --- lib/PublicInbox/LeiXSearch.pm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 7b33677e..987a9896 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -192,12 +192,14 @@ sub git { } sub query_done { # EOF callback - my ($self, $lei) = @_; - my $l2m = delete $lei->{l2m}; - $l2m->wq_wait_old if $l2m; - $self->wq_wait_old; + my ($lei) = @_; + my $has_l2m = exists $lei->{l2m}; + for my $f (qw(lxs l2m)) { + my $wq = delete $lei->{$f} or next; + $wq->wq_wait_old; + } $lei->{ovv}->ovv_end($lei); - if ($l2m) { # close() calls LeiToMail reap_compress + if ($has_l2m) { # close() calls LeiToMail reap_compress close(delete($lei->{1})) if $lei->{1}; $lei->start_mua; } @@ -246,16 +248,14 @@ sub query_prepare { # called by wq_do syswrite($lei->{0}, '.') == 1 or die "do_post_augment trigger: $!"; } -sub sigpipe_handler { # handles SIGPIPE from wq workers - my ($self, $lei_orig) = @_; - if ($self->wq_kill_old) { +sub sigpipe_handler { # handles SIGPIPE from l2m/lxs workers + my ($lei) = @_; + my $lxs = delete $lei->{lxs}; + if ($lxs && $lxs->wq_kill_old) { kill 'PIPE', $$; - $self->wq_wait_old; - } else { - $self->wq_kill; - $self->wq_close; + $lxs->wq_wait_old; } - close(delete $lei_orig->{1}) if $lei_orig->{1}; + close(delete $lei->{1}) if $lei->{1}; } sub do_query { @@ -266,8 +266,8 @@ sub do_query { $lei_orig->event_step_init; # wait for shutdowns my $done_op = { - '' => [ \&query_done, $self, $lei_orig ], - '!' => [ \&sigpipe_handler, $self, $lei_orig ] + '' => [ \&query_done, $lei_orig ], + '!' => [ \&sigpipe_handler, $lei_orig ] }; my $in_loop = exists $lei_orig->{sock}; $done = PublicInbox::OpPipe->new($done, $done_op, $in_loop);
next prev parent reply other threads:[~2021-01-21 19:46 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-21 19:46 [PATCH 00/12] lei: another dump Eric Wong 2021-01-21 19:46 ` [PATCH 01/12] lei_overview: rename {relevance} => {pct} Eric Wong 2021-01-21 19:46 ` [PATCH 02/12] lei q: retrieve keywords for local, non-external messages Eric Wong 2021-01-21 19:46 ` [PATCH 03/12] lei_xsearch: eliminate some unused, commented-out code Eric Wong 2021-01-21 19:46 ` [PATCH 04/12] lei: show {pct} and {oid} in From_ lines and filenames Eric Wong 2021-01-21 19:46 ` [PATCH 05/12] lei: fix inadvertant FD sharing Eric Wong 2021-01-21 19:46 ` [PATCH 06/12] lei_to_mail: avoid segfault on exit Eric Wong 2021-01-21 19:46 ` [PATCH 07/12] lei: oneshot: use client $io[2] for placeholder Eric Wong 2021-01-21 19:46 ` [PATCH 08/12] lei: remove INT/QUIT/TERM handlers, fix daemon EOF Eric Wong 2021-01-21 19:46 ` Eric Wong [this message] 2021-01-21 19:46 ` [PATCH 10/12] lei: remove @TO_CLOSE_ATFORK_CHILD Eric Wong 2021-01-21 19:46 ` [PATCH 11/12] lei: forget-external support with canonicalization Eric Wong 2021-01-21 19:46 ` [PATCH 12/12] lei forget-external: bash completion support 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=20210121194624.32002-10-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 09/12] lei_xsearch: reduce reference paths to lxs' \ /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).