lei + ipc: simplify process reaping

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

diff --git a/lib/PublicInbox/LeiImportKw.pm b/lib/PublicInbox/LeiImportKw.pm
index 402125cf5a43a4b1d1cb0cc0988367313a310907..54454511f7bbee48dae0103d84c3a1bae3df16c4 100644 (file)
--- a/lib/PublicInbox/LeiImportKw.pm
+++ b/lib/PublicInbox/LeiImportKw.pm
@@ -11,7 +11,9 @@ use parent qw(PublicInbox::IPC);
 sub new {
        my ($cls, $lei) = @_;
        my $self = bless { -wq_ident => 'lei import_kw worker' }, $cls;
-       my ($op_c, $ops) = $lei->workers_start($self, $self->detect_nproc);
+       my $j = $self->detect_nproc // 4;
+       $j = 4 if $j > 4;
+       my ($op_c, $ops) = $lei->workers_start($self, $j);
        $op_c->{ops} = $ops; # for PktOp->event_step
        $self->{lei_sock} = $lei->{sock};
        $lei->{ikw} = $self;
@@ -32,25 +34,22 @@ sub ipc_atfork_child {
 
 sub ck_update_kw { # via wq_io_do
        my ($self, $url, $uid, $kw) = @_;
-       my $oidbin = $self->{-lms_ro}->imap_oidbin($url, $uid) // return;
-       my @docids = $self->{over}->oidbin_exists($oidbin) or return;
+       my @oidbin = $self->{-lms_ro}->num_oidbin($url, $uid);
+       my $uid_url = "$url/;UID=$uid";
+       @oidbin > 1 and warn("W: $uid_url not unique:\n",
+                               map { "\t".unpack('H*', $_)."\n" } @oidbin);
+       my %seen;
+       my @docids = sort { $a <=> $b } grep { !$seen{$_}++ }
+               map { $self->{over}->oidbin_exists($_) } @oidbin;
        $self->{lse}->kw_changed(undef, $kw, \@docids) or return;
-       $self->{verbose} and
-               $self->{lei}->qerr('# '.unpack('H*', $oidbin)." => @$kw\n");
-       $self->{sto}->ipc_do('set_eml_vmd', undef, { kw => $kw }, \@docids);
-}
-
-sub ikw_done_wait {
-       my ($arg, $pid) = @_;
-       my ($self, $lei) = @$arg;
-       $lei->can('wq_done_wait')->($arg, $pid);
+       $self->{verbose} and $self->{lei}->qerr("# $uid_url => @$kw\n");
+       $self->{sto}->wq_do('set_eml_vmd', undef, { kw => $kw }, \@docids);
 }
 
 sub _lei_wq_eof { # EOF callback for main lei daemon
        my ($lei) = @_;
        my $ikw = delete $lei->{ikw} or return $lei->fail;
        $lei->sto_done_request($ikw->{lei_sock});
-       $ikw->wq_wait_old(\&ikw_done_wait, $lei);
 }
 
 1;