lei + ipc: simplify process reaping

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

diff --git a/lib/PublicInbox/LeiPmdir.pm b/lib/PublicInbox/LeiPmdir.pm
index aa9ce713507a2448a1e50ced1ccd544669f8d756..f9b68fc2a2d83b660f6101d97fc20e96136f3f45 100644 (file)
--- a/lib/PublicInbox/LeiPmdir.pm
+++ b/lib/PublicInbox/LeiPmdir.pm
@@ -25,20 +25,16 @@ sub new {
        my ($op_c, $ops) = $lei->workers_start($self, $nproc,
                undef, { ipt => $ipt }); # LeiInput subclass
        $op_c->{ops} = $ops; # for PktOp->event_step
+       $self->{lei_sock} = $lei->{sock}; # keep client for pmd_done_wait
        $lei->{pmd} = $self;
 }
 
 sub ipc_atfork_child {
        my ($self) = @_;
-       my $lei = $self->{lei};
-       $lei->_lei_atfork_child;
        my $ipt = $self->{ipt} // die 'BUG: no self->{ipt}';
-       $ipt->{lei} = $lei;
-       $ipt->{sto} = $lei->{sto} // die 'BUG: no lei->{sto}';
-       $ipt->{lse} = $ipt->{sto}->search;
-       $ipt->{over} = $ipt->{lse}->over;
-       $ipt->{-lms_ro} //= $ipt->{lse}->lms; # may be undef or '0'
-       $self->SUPER::ipc_atfork_child;
+       my $lei = $ipt->{lei} = $self->{lei};
+       delete @$lei{qw(auth net)}; # no network access in this worker
+       $ipt->ipc_atfork_child; # calls _lei_atfork_child;
 }
 
 sub each_mdir_fn { # maildir_each_file callback
@@ -51,17 +47,10 @@ sub mdir_iter { # via wq_io_do
        $self->{ipt}->pmdir_cb($f, $fl, @args);
 }
 
-sub pmd_done_wait {
-       my ($arg, $pid) = @_;
-       my ($self, $lei) = @$arg;
-       my $wait = $lei->{sto}->ipc_do('done');
-       $lei->can('wq_done_wait')->($arg, $pid);
-}
-
 sub _lei_wq_eof { # EOF callback for main lei daemon
        my ($lei) = @_;
        my $pmd = delete $lei->{pmd} or return $lei->fail;
-       $pmd->wq_wait_old(\&pmd_done_wait, $lei);
+       $lei->sto_done_request($pmd->{lei_sock});
 }
 
 1;