lei_overview: avoid unnecessary {l2m} delete

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

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index fa04145762c573838ee8b89e0cd2466fc6758fee..ff15d2951c0c52375336e396e739174ce04faddb 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -26,16 +26,15 @@ sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) }
 # we open this in the parent process before ->wq_do handoff
 sub ovv_out_lk_init ($) {
        my ($self) = @_;
-       $self->{tmp_lk_id} = "$self.$$";
        my $tmp = File::Temp->new("lei-ovv.dst.$$.lock-XXXXXX",
                                        TMPDIR => 1, UNLINK => 0);
-       $self->{lock_path} = $tmp->filename;
+       $self->{"lk_id.$self.$$"} = $self->{lock_path} = $tmp->filename;
 }
 
 sub ovv_out_lk_cancel ($) {
        my ($self) = @_;
-       ($self->{tmp_lk_id}//'') eq "$self.$$" and
-               unlink(delete($self->{lock_path}));
+       my $lock_path = delete $self->{"lk_id.$self.$$"} or return;
+       unlink($lock_path);
 }
 
 sub detect_fmt ($$) {
@@ -107,28 +106,22 @@ sub new {
 sub ovv_begin {
        my ($self, $lei) = @_;
        if ($self->{fmt} eq 'json') {
-               print { $lei->{1} } '[';
+               $lei->out('[');
        } # TODO HTML/Atom/...
 }
 
 # called once by parent (via PublicInbox::EOFpipe)
 sub ovv_end {
        my ($self, $lei) = @_;
-       my $out = $lei->{1} or return;
        if ($self->{fmt} eq 'json') {
                # JSON doesn't allow trailing commas, and preventing
                # trailing commas is a PITA when parallelizing outputs
-               print $out "null]\n";
+               $lei->out("null]\n");
        } elsif ($self->{fmt} eq 'concatjson') {
-               print $out "\n";
+               $lei->out("\n");
        }
 }
 
-sub ovv_atfork_child {
-       my ($self) = @_;
-       # reopen dedupe here
-}
-
 # prepares an smsg for JSON
 sub _unbless_smsg {
        my ($smsg, $mitem) = @_;
@@ -154,10 +147,8 @@ sub _unbless_smsg {
 
 sub ovv_atexit_child {
        my ($self, $lei) = @_;
-       if (my $l2m = delete $lei->{l2m}) {
-               # gracefully stop lei2mail processes after all
-               # ->write_mail work is complete
-               delete $l2m->{-wq_s1};
+       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
                }
@@ -168,9 +159,8 @@ sub ovv_atexit_child {
                $git->async_wait_all;
        }
        if (my $bref = delete $lei->{ovv_buf}) {
-               my $out = $lei->{1} or return;
                my $lk = $self->lock_for_scope;
-               print $out $$bref;
+               $lei->out($$bref);
        }
 }
 
@@ -268,11 +258,10 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                                }
                        } sort keys %$smsg);
                        $buf .= $EOR;
-                       if (length($buf) > 65536) {
-                               my $lk = $self->lock_for_scope;
-                               print { $lei->{1} } $buf;
-                               $buf = '';
-                       }
+                       return if length($buf) < 65536;
+                       my $lk = $self->lock_for_scope;
+                       $lei->out($buf);
+                       $buf = '';
                }
        } elsif ($json) {
                my $ORS = $self->{fmt} eq 'json' ? ",\n" : "\n"; # JSONL
@@ -280,11 +269,10 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                        my ($smsg, $mitem) = @_;
                        return if $dedupe->is_smsg_dup($smsg);
                        $buf .= $json->encode(_unbless_smsg(@_)) . $ORS;
-                       if (length($buf) > 65536) {
-                               my $lk = $self->lock_for_scope;
-                               print { $lei->{1} } $buf;
-                               $buf = '';
-                       }
+                       return if length($buf) < 65536;
+                       my $lk = $self->lock_for_scope;
+                       $lei->out($buf);
+                       $buf = '';
                }
        } # else { ...
 }