ipc+lei: switch to awaitpid

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

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 67e86a43409cd2d6890913e882d12237bc33cb8c..edc5ba6486f12a888432d3828fdd4e7f354cff75 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # base class for remote IPC calls and workqueues, requires Storable or Sereal
@@ -12,7 +12,7 @@ use strict;
 use v5.10.1;
 use parent qw(Exporter);
 use Carp qw(croak);
-use PublicInbox::DS qw(dwaitpid);
+use PublicInbox::DS qw(awaitpid);
 use PublicInbox::Spawn;
 use PublicInbox::OnDestroy;
 use PublicInbox::WQWorker;
@@ -43,7 +43,7 @@ if ($enc && $dec) { # should be custom ops
 }
 
 my $recv_cmd = PublicInbox::Spawn->can('recv_cmd4');
-my $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
+our $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
        require PublicInbox::CmdIPC4;
        $recv_cmd //= PublicInbox::CmdIPC4->can('recv_cmd4');
        PublicInbox::CmdIPC4->can('send_cmd4');
@@ -133,27 +133,26 @@ sub ipc_worker_spawn {
        $self->{-ipc_req} = $w_req;
        $self->{-ipc_res} = $r_res;
        $self->{-ipc_ppid} = $$;
+       awaitpid($pid, \&ipc_worker_reap, $self);
        $self->{-ipc_pid} = $pid;
 }
 
-sub ipc_worker_reap { # dwaitpid callback
-       my ($args, $pid) = @_;
-       my ($self, @uargs) = @$args;
+sub ipc_worker_reap { # awaitpid callback
+       my ($pid, $self) = @_;
        delete $self->{-wq_workers}->{$pid};
-       return $self->{-reap_do}->($args, $pid) if $self->{-reap_do};
+       if (my $cb_args = $self->{-reap_do}) {
+               return $cb_args->[0]->($pid, $self, @$cb_args[1..$#$cb_args]);
+       }
        return if !$?;
        my $s = $? & 127;
        # TERM(15) is our default exit signal, PIPE(13) is likely w/ pager
        warn "$self->{-wq_ident} PID:$pid died \$?=$?\n" if $s != 15 && $s != 13
 }
 
-sub wq_wait_async {
-       my ($self, $cb, @uargs) = @_;
-       local $PublicInbox::DS::in_loop = 1;
-       $self->{-reap_async} = 1;
-       $self->{-reap_do} = $cb;
-       my @pids = keys %{$self->{-wq_workers}};
-       dwaitpid($_, \&ipc_worker_reap, [ $self, @uargs ]) for @pids;
+# register wait workers
+sub awaitpid_init {
+       my ($self, @cb_args) = @_;
+       $self->{-reap_do} = \@cb_args;
 }
 
 # for base class, override in sub classes
@@ -170,7 +169,7 @@ sub ipc_atfork_child {
 
 # idempotent, can be called regardless of whether worker is active or not
 sub ipc_worker_stop {
-       my ($self, $args) = @_;
+       my ($self) = @_;
        my ($pid, $ppid) = delete(@$self{qw(-ipc_pid -ipc_ppid)});
        my ($w_req, $r_res) = delete(@$self{qw(-ipc_req -ipc_res)});
        if (!$w_req && !$r_res) {
@@ -179,9 +178,7 @@ sub ipc_worker_stop {
        }
        die 'no PID with IPC pipes' unless $pid;
        $w_req = $r_res = undef;
-
-       return if $$ != $ppid;
-       dwaitpid($pid, \&ipc_worker_reap, [$self, $args]);
+       awaitpid($pid) if $$ == $ppid; # for non-event loop
 }
 
 # use this if we have multiple readers reading curl or "pigz -dc"
@@ -348,6 +345,24 @@ sub wq_do {
        }
 }
 
+sub prepare_nonblock {
+       ($_[0]->{-wq_s1} // die 'BUG: no {-wq_s1}')->blocking(0);
+       $_[0]->{-reap_do} or die 'BUG: {-reap_do} needed for nonblock';
+       require PublicInbox::WQBlocked;
+}
+
+sub wq_nonblock_do { # always async
+       my ($self, $sub, @args) = @_;
+       my $buf = ipc_freeze([$sub, @args]);
+       if ($self->{wqb}) { # saturated once, assume saturated forever
+               $self->{wqb}->flush_send($buf);
+       } else {
+               $send_cmd->($self->{-wq_s1}, [], $buf, MSG_EOR) //
+                       ($!{EAGAIN} ? PublicInbox::WQBlocked->new($self, $buf)
+                                       : croak("sendmsg: $!"));
+       }
+}
+
 sub _wq_worker_start ($$$$) {
        my ($self, $oldset, $fields, $one) = @_;
        my ($bcast1, $bcast2);
@@ -380,6 +395,7 @@ sub _wq_worker_start ($$$$) {
                undef $end; # trigger exit
        } else {
                $self->{-wq_workers}->{$pid} = $bcast1;
+               awaitpid($pid, \&ipc_worker_reap, $self);
        }
 }
 
@@ -405,10 +421,13 @@ sub wq_workers_start {
 
 sub wq_close {
        my ($self) = @_;
+       if (my $wqb = delete $self->{wqb}) {
+               $self->{-reap_do} or die 'BUG: {-reap_do} unset';
+               $wqb->enq_close;
+       }
        delete @$self{qw(-wq_s1 -wq_s2)} or return;
-       return if $self->{-reap_async};
-       my @pids = keys %{$self->{-wq_workers}};
-       dwaitpid($_, \&ipc_worker_reap, [ $self ]) for @pids;
+       return if $self->{-reap_do};
+       awaitpid($_) for keys %{$self->{-wq_workers}};
 }
 
 sub wq_kill {