pkt_op: rely on DS::in_loop global

No reason to check for $lei->{oneshot} here.

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 37bd233e90106221ca17a94e24e2f4c46f335180..23a9c020fb01b4ecbf11854ec60d8373af9fc976 100644 (file)
--- 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 59b37ff8129c3f8c6ac59e6115f01af0c50688cd..40c7262a3848d01dd222b9e0b715d7b982eb0e0a 100644 (file)
--- 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