ipc: wq_do => wq_io_do

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

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 52da225dea7fb983d5c58fb440e6551706009791..dcfb9cc7d54a7a7f974a3c2c4c5680ba1218541f 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -23,7 +23,7 @@ my $JSONL = 'ldjson|ndjson|jsonl'; # 3 names for the same thing
 
 sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) }
 
-# we open this in the parent process before ->wq_do handoff
+# we open this in the parent process before ->wq_io_do handoff
 sub ovv_out_lk_init ($) {
        my ($self) = @_;
        my $tmp = File::Temp->new("lei-ovv.dst.$$.lock-XXXXXX",
@@ -78,10 +78,8 @@ sub new {
        if ($fmt =~ /\A($JSONL|(?:concat)?json)\z/) {
                $json = $self->{json} = ref(PublicInbox::Config->json);
        }
-       my ($isatty, $seekable);
        if ($dst eq '/dev/stdout') {
-               $isatty = -t $lei->{1};
-               $lei->start_pager if $isatty;
+               my $isatty = $lei->{need_pager} = -t $lei->{1};
                $opt->{pretty} //= $isatty;
                if (!$isatty && -f _) {
                        my $fl = fcntl($lei->{1}, F_GETFL, 0) //
@@ -149,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);
@@ -195,7 +182,6 @@ sub _json_pretty {
 sub ovv_each_smsg_cb { # runs in wq worker usually
        my ($self, $lei, $ibxish) = @_;
        my ($json, $dedupe);
-       $lei->{1}->autoflush(1);
        if (my $pkg = $self->{json}) {
                $json = $pkg->new;
                $json->utf8->canonical;
@@ -208,7 +194,6 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
        }
        $lei->{ovv_buf} = \(my $buf = '') if !$l2m;
        if ($l2m && !$ibxish) { # remote https?:// mboxrd
-               delete $l2m->{-wq_s1};
                my $g2m = $l2m->can('git_to_mail');
                my $wcb = $l2m->write_cb($lei);
                sub {
@@ -216,33 +201,12 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                        $wcb->(undef, $smsg, $eml);
                };
        } elsif ($l2m && $l2m->{-wq_s1}) {
-               my ($lei_ipc, @io) = $lei->atfork_parent_wq($l2m);
-               # $io[-1] becomes a notification pipe that triggers EOF
-               # in this wq worker when all outstanding ->write_mail
-               # calls are complete
-               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};
+               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,
-                                       $lei_ipc);
+                       $l2m->wq_io_do('write_mail', [], $git_dir, $smsg);
                }
-       } elsif ($l2m) {
-               my $wcb = $l2m->write_cb($lei);
-               my $git = $ibxish->git; # (LeiXSearch|Inbox|ExtSearch)->git
-               $self->{git} = $git; # for ovv_atexit_child
-               my $g2m = $l2m->can('git_to_mail');
-               sub {
-                       my ($smsg, $mitem) = @_;
-                       $smsg->{pct} = get_pct($mitem) if $mitem;
-                       $git->cat_async($smsg->{blob}, $g2m, [ $wcb, $smsg ]);
-               };
        } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) {
                my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},";
                sub { # DIY prettiness :P
@@ -276,7 +240,9 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                        $lei->out($buf);
                        $buf = '';
                }
-       } # else { ...
+       } else {
+               die "TODO: unhandled case $self->{fmt}"
+       }
 }
 
 no warnings 'once';