ipc: remove {-reap_async} field

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

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 3e299448b334629fb6427e7df02976381ec19242..671ad5d536003abd4722a90d12834694dbff74a2 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
@@ -43,10 +43,14 @@ 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');
+} // do {
+       require PublicInbox::Syscall;
+       $recv_cmd //= PublicInbox::Syscall->can('recv_cmd4');
+       PublicInbox::Syscall->can('send_cmd4');
 };
 
 sub _get_rec ($) {
@@ -146,7 +150,6 @@ sub ipc_worker_reap { # dwaitpid callback
 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;
@@ -247,7 +250,7 @@ sub recv_and_run {
        undef $buf;
        my $sub = shift @$args;
        eval { $self->$sub(@$args) };
-       warn "$$ $0 wq_worker: $@" if $@;
+       warn "$$ $0 wq_worker: $sub: $@" if $@;
        delete @$self{0..($nfd-1)};
        $n;
 }
@@ -344,6 +347,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);
@@ -401,8 +422,12 @@ 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};
+       return if $self->{-reap_do};
        my @pids = keys %{$self->{-wq_workers}};
        dwaitpid($_, \&ipc_worker_reap, [ $self ]) for @pids;
 }