lei: less error-prone FD mapping

[public-inbox.git] / lib / PublicInbox / LeiOverview.pm

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 880c7acccb09f7d86c5169f9195483184217a6b8..c67e2747edfac4faeb1613abcca10a8263a73775 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -208,7 +208,6 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                $json = $pkg->new;
                $json->utf8->canonical;
                $json->ascii(1) if $lei->{opt}->{ascii};
-               $lei->{ovv_buf} = \(my $buf = '');
        }
        my $l2m = $lei->{l2m} or $dedupe->prepare_dedupe;
        if ($l2m && !$ibxish) { # remote https?:// mboxrd
@@ -221,14 +220,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);
-               # n.b. $io[0] = qry_status_wr, $io[1] = mbox|stdout,
-               # $io[4] becomes a notification pipe that triggers EOF
+               # $io[-1] becomes a notification pipe that triggers EOF
                # in this wq worker when all outstanding ->write_mail
                # calls are complete
-               die "BUG: \$io[4] $io[4] unexpected" if $io[4];
-               pipe($l2m->{each_smsg_done}, $io[4]) or die "pipe: $!";
-               fcntl($io[4], 1031, 4096) if $^O eq 'linux';
+               pipe($l2m->{each_smsg_done}, $io[$#io + 1]) or die "pipe: $!";
+               fcntl($io[-1], 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};
@@ -286,10 +284,6 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                                $buf = '';
                        }
                }
-       } elsif ($self->{fmt} eq 'oid') {
-               sub {
-                       my ($smsg, $mitem) = @_;
-               }
        } # else { ...
 }