X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIPC.pm;h=548a72ebb11c70dba1ba1360fdc8d6d5598b9c95;hb=HEAD;hp=205b5b92cf71d4b1755a93dc7635a12767c9ab95;hpb=5824d0d4ffac120a2840c980b4570868d6b3ea6b;p=public-inbox.git diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 205b5b92..548a72eb 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # 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,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 ($) { @@ -92,7 +96,7 @@ sub ipc_worker_loop ($$$) { # starts a worker if Sereal or Storable is installed sub ipc_worker_spawn { - my ($self, $ident, $oldset, $fields) = @_; + my ($self, $ident, $oldset, $fields, @cb_args) = @_; return if ($self->{-ipc_ppid} // -1) == $$; # idempotent delete(@$self{qw(-ipc_req -ipc_res -ipc_ppid -ipc_pid)}); pipe(my ($r_req, $w_req)) or die "pipe: $!"; @@ -129,21 +133,18 @@ sub ipc_worker_spawn { $self->{-ipc_req} = $w_req; $self->{-ipc_res} = $r_res; $self->{-ipc_ppid} = $$; + awaitpid($pid, \&ipc_worker_reap, $self, @cb_args); $self->{-ipc_pid} = $pid; } -sub ipc_worker_reap { # dwaitpid callback - my ($args, $pid) = @_; +sub ipc_worker_reap { # awaitpid callback + my ($pid, $self, $cb, @args) = @_; + delete $self->{-wq_workers}->{$pid}; + return $cb->($pid, $self, @args) if $cb; return if !$?; - # TERM(15) is our default exit signal, PIPE(13) is likely w/ pager my $s = $? & 127; - warn "PID:$pid died with \$?=$?\n" if $s != 15 && $s != 13; -} - -sub wq_wait_old { - my ($self, $cb, @args) = @_; - my $pids = delete $self->{"-wq_old_pids.$$"} or return; - dwaitpid($_, $cb // \&ipc_worker_reap, [$self, @args]) for @$pids; + # 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 } # for base class, override in sub classes @@ -160,7 +161,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) { @@ -169,9 +170,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" @@ -241,7 +240,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; } @@ -251,7 +250,7 @@ sub wq_worker_loop ($$) { my $wqw = PublicInbox::WQWorker->new($self, $self->{-wq_s2}); PublicInbox::WQWorker->new($self, $bcast2) if $bcast2; PublicInbox::DS->SetPostLoopCallback(sub { $wqw->{sock} }); - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); PublicInbox::DS->Reset; } @@ -338,8 +337,25 @@ sub wq_do { } } -sub _wq_worker_start ($$$$) { - my ($self, $oldset, $fields, $one) = @_; +sub prepare_nonblock { + ($_[0]->{-wq_s1} // die 'BUG: no {-wq_s1}')->blocking(0); + 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, @cb_args) = @_; my ($bcast1, $bcast2); $one or socketpair($bcast1, $bcast2, AF_UNIX, $SEQPACKET, 0) or die "socketpair: $!"; @@ -353,7 +369,6 @@ sub _wq_worker_start ($$$$) { delete @$self{qw(-wq_s1 -wq_ppid)}; $self->{-wq_worker_nr} = keys %{delete($self->{-wq_workers}) // {}}; - $SIG{$_} = 'IGNORE' for (qw(PIPE)); $SIG{$_} = 'DEFAULT' for (qw(TTOU TTIN TERM QUIT INT CHLD)); local $0 = $one ? $self->{-wq_ident} : "$self->{-wq_ident} $self->{-wq_worker_nr}"; @@ -371,12 +386,13 @@ sub _wq_worker_start ($$$$) { undef $end; # trigger exit } else { $self->{-wq_workers}->{$pid} = $bcast1; + awaitpid($pid, \&ipc_worker_reap, $self, @cb_args); } } # starts workqueue workers if Sereal or Storable is installed sub wq_workers_start { - my ($self, $ident, $nr_workers, $oldset, $fields) = @_; + my ($self, $ident, $nr_workers, $oldset, $fields, @cb_args) = @_; ($send_cmd && $recv_cmd && defined($SEQPACKET)) or return; return if $self->{-wq_s1}; # idempotent $self->{-wq_s1} = $self->{-wq_s2} = undef; @@ -389,48 +405,34 @@ sub wq_workers_start { $self->{-wq_ident} = $ident; my $one = $nr_workers == 1; $self->{-wq_nr_workers} = $nr_workers; - _wq_worker_start($self, $sigset, $fields, $one) for (1..$nr_workers); + for (1..$nr_workers) { + _wq_worker_start($self, $sigset, $fields, $one, @cb_args); + } PublicInbox::DS::sig_setmask($sigset) unless $oldset; $self->{-wq_ppid} = $$; } sub wq_close { - my ($self, $nohang, $cb, @args) = @_; - delete @$self{qw(-wq_s1 -wq_s2)} or return; - my $ppid = delete $self->{-wq_ppid} or return; - my $workers = delete $self->{-wq_workers} // die 'BUG: no wq_workers'; - return if $ppid != $$; # can't reap siblings or parents - my @pids = map { $_ + 0 } keys %$workers; - if ($nohang) { - push @{$self->{"-wq_old_pids.$$"}}, @pids; - } else { - $cb //= \&ipc_worker_reap; - unshift @args, $self; - dwaitpid($_, $cb, \@args) for @pids; + my ($self) = @_; + if (my $wqb = delete $self->{wqb}) { + $wqb->enq_close; } -} - -sub wq_kill_old { - my ($self, $sig) = @_; - my $pids = $self->{"-wq_old_pids.$$"} or return; - kill($sig // 'TERM', @$pids); + delete @$self{qw(-wq_s1 -wq_s2)} or return; + return if ($self->{-wq_ppid} // -1) != $$; + awaitpid($_) for keys %{$self->{-wq_workers}}; } sub wq_kill { my ($self, $sig) = @_; - my $workers = $self->{-wq_workers} or return; - kill($sig // 'TERM', keys %$workers); + kill($sig // 'TERM', keys %{$self->{-wq_workers}}); } sub DESTROY { my ($self) = @_; my $ppid = $self->{-wq_ppid}; wq_kill($self) if $ppid && $ppid == $$; - my $err = $?; wq_close($self); - wq_wait_old($self); ipc_worker_stop($self); - $? = $err if $err; } sub detect_nproc () {