about summary refs log tree commit homepage
path: root/lib/PublicInbox/LeiOverview.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-02-04 00:59:27 -0900
committerEric Wong <e@80x24.org>2021-02-05 00:16:32 +0000
commit5180ed0a1cd65139a6ba6b3c64e97f8c2c126204 (patch)
treef97d57ef8060199539bdcc7fc97706cd2194b9d0 /lib/PublicInbox/LeiOverview.pm
parent69ea1bcb2983d2c51caf04440d4797212ed6fd64 (diff)
downloadpublic-inbox-5180ed0a1cd65139a6ba6b3c64e97f8c2c126204.tar.gz
Another step towards simplifying lei internals.

None of our current uses of ->wq_do involve FD passing, and the
plan is only rely on FD passing between lei-daemon and lei(1).
Internally, it ought to be possible for lei-daemon internal bits
to be ordered properly to not need FD passing.
Diffstat (limited to 'lib/PublicInbox/LeiOverview.pm')
-rw-r--r--lib/PublicInbox/LeiOverview.pm23
1 files changed, 2 insertions, 21 deletions
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 3125f015..d3df4faa 100644
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -147,17 +147,6 @@ sub _unbless_smsg {
 
 sub ovv_atexit_child {
         my ($self, $lei) = @_;
-        if (my $l2m = $lei->{l2m}) {
-                # wait for ->write_mail work we submitted to lei2mail
-                if (my $rd = delete $l2m->{each_smsg_done}) {
-                        read($rd, my $buf, 1); # wait for EOF
-                }
-        }
-        # order matters, git->{-tmp}->DESTROY must not fire until
-        # {each_smsg_done} hits EOF above
-        if (my $git = delete $self->{git}) {
-                $git->async_wait_all;
-        }
         if (my $bref = delete $lei->{ovv_buf}) {
                 my $lk = $self->lock_for_scope;
                 $lei->out($$bref);
@@ -213,19 +202,11 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                         $wcb->(undef, $smsg, $eml);
                 };
         } elsif ($l2m && $l2m->{-wq_s1}) {
-                # $io->[0] becomes a notification pipe that triggers EOF
-                # in this wq worker when all outstanding ->write_mail
-                # calls are complete
-                my $io = [];
-                pipe($l2m->{each_smsg_done}, $io->[0]) or die "pipe: $!";
-                fcntl($io->[0], 1031, 4096) if $^O eq 'linux'; # F_SETPIPE_SZ
-                my $git = $ibxish->git; # (LeiXSearch|Inbox|ExtSearch)->git
-                $self->{git} = $git;
-                my $git_dir = $git->{git_dir};
+                my $git_dir = $ibxish->git->{git_dir};
                 sub {
                         my ($smsg, $mitem) = @_;
                         $smsg->{pct} = get_pct($mitem) if $mitem;
-                        $l2m->wq_do('write_mail', $io, $git_dir, $smsg);
+                        $l2m->wq_do('write_mail', [], $git_dir, $smsg);
                 }
         } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) {
                 my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},";