ipc+lei: switch to awaitpid

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 03cbde3bd7cf264c141f885a8b4e73c157b30865..6a4554e76d323e333af5ab128741fca5c649f913 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -132,23 +132,26 @@ sub eml2mboxcl2 {
 }
 
 sub git_to_mail { # git->cat_async callback
-       my ($bref, $oid, $type, $size, $arg) = @_;
+       my ($bref, $oid, $type, $size, $smsg) = @_;
+       my $self = delete $smsg->{l2m} // die "BUG: no l2m";
        $type // return; # called by git->async_abort
-       my ($write_cb, $smsg) = @$arg;
-       if ($type eq 'missing' && $smsg->{-lms_rw}) {
-               if ($bref = $smsg->{-lms_rw}->local_blob($oid, 1)) {
+       eval {
+               if ($type eq 'missing' &&
+                         ($bref = $self->{-lms_rw}->local_blob($oid, 1))) {
                        $type = 'blob';
                        $size = length($$bref);
                }
-       }
-       return warn("W: $oid is $type (!= blob)\n") if $type ne 'blob';
-       return warn("E: $oid is empty\n") unless $size;
-       die "BUG: expected=$smsg->{blob} got=$oid" if $smsg->{blob} ne $oid;
-       $write_cb->($bref, $smsg);
+               $type eq 'blob' or return $self->{lei}->child_error(1,
+                                               "W: $oid is $type (!= blob)");
+               $size or return $self->{lei}->child_error(1,"E: $oid is empty");
+               $smsg->{blob} eq $oid or die "BUG: expected=$smsg->{blob}";
+               $self->{wcb}->($bref, $smsg);
+       };
+       $self->{lei}->fail("$@ (oid=$oid)") if $@;
 }
 
-sub reap_compress { # dwaitpid callback
-       my ($lei, $pid) = @_;
+sub reap_compress { # awaitpid callback
+       my ($pid, $lei) = @_;
        my $cmd = delete $lei->{"pid.$pid"};
        return if $? == 0;
        $lei->fail("@$cmd failed", $? >> 8);
@@ -649,9 +652,8 @@ sub _do_augment_mbox {
        $dedupe->pause_dedupe if $dedupe;
 }
 
-sub v2w_done_wait { # dwaitpid callback
-       my ($arg, $pid) = @_;
-       my ($v2w, $lei) = @$arg;
+sub v2w_done_wait { # awaitpid cb (via awaitpid_init)
+       my ($pid, $v2w, $lei) = @_;
        $lei->child_error($?, "error for $v2w->{ibx}->{inboxdir}") if $?;
 }
 
@@ -677,8 +679,8 @@ sub _pre_augment_v2 {
        PublicInbox::InboxWritable->new($ibx, @creat);
        $ibx->init_inbox if @creat;
        my $v2w = $ibx->importer;
+       $v2w->awaitpid_init(\&v2w_done_wait, $lei);
        $v2w->wq_workers_start("lei/v2w $dir", 1, $lei->oldset, {lei => $lei});
-       $v2w->wq_wait_async(\&v2w_done_wait, $lei);
        $lei->{v2w} = $v2w;
        return if !$lei->{opt}->{shared};
        my $d = "$lei->{ale}->{git}->{git_dir}/objects";
@@ -790,19 +792,22 @@ sub poke_dst {
 
 sub write_mail { # via ->wq_io_do
        my ($self, $smsg, $eml) = @_;
-       return $self->{wcb}->(undef, $smsg, $eml) if $eml;
-       $smsg->{-lms_rw} = $self->{-lms_rw};
-       $self->{git}->cat_async($smsg->{blob}, \&git_to_mail,
-                               [$self->{wcb}, $smsg]);
+       if ($eml) {
+               eval { $self->{wcb}->(undef, $smsg, $eml) };
+               $self->{lei}->fail("blob=$smsg->{blob} $@") if $@;
+       } else {
+               $smsg->{l2m} = $self;
+               $self->{git}->cat_async($smsg->{blob}, \&git_to_mail, $smsg);
+       }
 }
 
 sub wq_atexit_child {
        my ($self) = @_;
        local $PublicInbox::DS::in_loop = 0; # waitpid synchronously
        my $lei = $self->{lei};
-       delete $self->{wcb};
        $lei->{ale}->git->async_wait_all;
        my ($nr_w, $nr_s) = delete(@$lei{qw(-nr_write -nr_seen)});
+       delete $self->{wcb};
        $nr_s or return;
        return if $lei->{early_mua} || !$lei->{-progress} || !$lei->{pkt_op_p};
        $lei->{pkt_op_p}->pkt_do('l2m_progress', $nr_w, $nr_s);