From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 03/11] pkt_op: rely on DS::in_loop global Date: Tue, 2 Feb 2021 22:11:35 -1000 [thread overview] Message-ID: <20210203081143.24424-4-e@80x24.org> (raw) In-Reply-To: <20210203081143.24424-1-e@80x24.org> No reason to check for $lei->{oneshot} here. --- lib/PublicInbox/LeiXSearch.pm | 2 +- lib/PublicInbox/PktOp.pm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 37bd233e..23a9c020 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -421,7 +421,7 @@ sub do_query { '' => [ \&query_done, $lei ], 'mset_progress' => [ \&mset_progress, $lei ], }; - (my $op, $lei->{pkt_op}) = PublicInbox::PktOp->pair($ops, !$lei->{oneshot}); + (my $op, $lei->{pkt_op}) = PublicInbox::PktOp->pair($ops); my ($lei_ipc, @io) = $lei->atfork_parent_wq($self); delete($lei->{pkt_op}); diff --git a/lib/PublicInbox/PktOp.pm b/lib/PublicInbox/PktOp.pm index 59b37ff8..40c7262a 100644 --- a/lib/PublicInbox/PktOp.pm +++ b/lib/PublicInbox/PktOp.pm @@ -17,9 +17,9 @@ use PublicInbox::IPC qw(ipc_freeze ipc_thaw); our @EXPORT_OK = qw(pkt_do); sub new { - my ($cls, $r, $ops, $in_loop) = @_; - my $self = bless { sock => $r, ops => $ops, re => [] }, $cls; - if ($in_loop) { # iff using DS->EventLoop + my ($cls, $r, $ops) = @_; + my $self = bless { sock => $r, ops => $ops }, $cls; + if ($PublicInbox::DS::in_loop) { # iff using DS->EventLoop $r->blocking(0); $self->SUPER::new($r, EPOLLIN|EPOLLET); } @@ -28,10 +28,10 @@ sub new { # returns a blessed object as the consumer, and a GLOB/IO for the producer sub pair { - my ($cls, $ops, $in_loop) = @_; + my ($cls, $ops) = @_; my ($c, $p); socketpair($c, $p, AF_UNIX, SOCK_SEQPACKET, 0) or die "socketpair: $!"; - (new($cls, $c, $ops, $in_loop), $p); + (new($cls, $c, $ops), $p); } sub pkt_do { # for the producer to trigger event_step in consumer
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 ` [PATCH 01/11] lei: reduce FD pressure from lei2mail worker Eric Wong 2021-02-03 8:11 ` [PATCH 02/11] lei: further reduce lei2mail FD pressure Eric Wong 2021-02-03 8:11 ` Eric Wong [this message] 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-4-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 03/11] pkt_op: rely on DS::in_loop global' \ /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).