X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIPC.pm;h=8376275e3c9501c52366b08b7eda7fe4024b5d49;hb=878604bada08970f8bfedc2e9efa687fbec0edbd;hp=92f35189a529c1e3de8534e61f2205f262bff782;hpb=12775b5be53db1244b9cb32ae2ef90f105735e1b;p=public-inbox.git diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 92f35189..8376275e 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -103,6 +103,7 @@ sub ipc_worker_spawn { my $pid = fork // die "fork: $!"; if ($pid == 0) { srand($seed); + eval { Net::SSLeay::randomize() }; eval { PublicInbox::DS->Reset }; delete @$self{qw(-wq_s1 -wq_s2 -wq_workers -wq_ppid)}; $w_req = $r_res = undef; @@ -115,7 +116,7 @@ sub ipc_worker_spawn { $fields //= {}; local @$self{keys %$fields} = values(%$fields); my $on_destroy = $self->ipc_atfork_child; - local %SIG = %SIG; + local @SIG{keys %SIG} = values %SIG; PublicInbox::DS::sig_setmask($sigset); ipc_worker_loop($self, $r_req, $w_res); }; @@ -133,16 +134,22 @@ sub ipc_worker_spawn { sub ipc_worker_reap { # dwaitpid callback my ($args, $pid) = @_; + my ($self, @uargs) = @$args; + delete $self->{-wq_workers}->{$pid}; + return $self->{-reap_do}->($args, $pid) if $self->{-reap_do}; 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; + # 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_old { - my ($self, $cb, @args) = @_; - my $pids = delete $self->{"-wq_old_pids.$$"} or return; - dwaitpid($_, $cb // \&ipc_worker_reap, [$self, @args]) for @$pids; +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; } # for base class, override in sub classes @@ -240,7 +247,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; } @@ -250,7 +257,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; } @@ -262,9 +269,10 @@ sub do_sock_stream { # via wq_io_do, for big requests sub wq_broadcast { my ($self, $sub, @args) = @_; if (my $wkr = $self->{-wq_workers}) { + my $buf = ipc_freeze([$sub, @args]); for my $bcast1 (values %$wkr) { - my $buf = ipc_freeze([$sub, @args]); - send($bcast1, $buf, MSG_EOR) // croak "send: $!"; + my $sock = $bcast1 // $self->{-wq_s1} // next; + send($sock, $buf, MSG_EOR) // croak "send: $!"; # XXX shouldn't have to deal with EMSGSIZE here... } } else { @@ -336,31 +344,31 @@ sub wq_do { } } -sub _wq_worker_start ($$$) { - my ($self, $oldset, $fields) = @_; +sub _wq_worker_start ($$$$) { + my ($self, $oldset, $fields, $one) = @_; my ($bcast1, $bcast2); - $self->{-wq_no_bcast} or - socketpair($bcast1, $bcast2, AF_UNIX, $SEQPACKET, 0) or + $one or socketpair($bcast1, $bcast2, AF_UNIX, $SEQPACKET, 0) or die "socketpair: $!"; my $seed = rand(0xffffffff); my $pid = fork // die "fork: $!"; if ($pid == 0) { srand($seed); + eval { Net::SSLeay::randomize() }; undef $bcast1; eval { PublicInbox::DS->Reset }; 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 = "$self->{-wq_ident} $self->{-wq_worker_nr}"; + local $0 = $one ? $self->{-wq_ident} : + "$self->{-wq_ident} $self->{-wq_worker_nr}"; # ensure we properly exit even if warn() dies: my $end = PublicInbox::OnDestroy->new($$, sub { exit(!!$@) }); eval { $fields //= {}; local @$self{keys %$fields} = values(%$fields); my $on_destroy = $self->ipc_atfork_child; - local %SIG = %SIG; + local @SIG{keys %SIG} = values %SIG; PublicInbox::DS::sig_setmask($oldset); wq_worker_loop($self, $bcast2); }; @@ -380,103 +388,36 @@ sub wq_workers_start { socketpair($self->{-wq_s1}, $self->{-wq_s2}, AF_UNIX, $SEQPACKET, 0) or die "socketpair: $!"; $self->ipc_atfork_prepare; - $nr_workers //= $self->{-wq_nr_workers}; + $nr_workers //= $self->{-wq_nr_workers}; # was set earlier my $sigset = $oldset // PublicInbox::DS::block_signals(); $self->{-wq_workers} = {}; $self->{-wq_ident} = $ident; - _wq_worker_start($self, $sigset, $fields) for (1..$nr_workers); + my $one = $nr_workers == 1; + $self->{-wq_nr_workers} = $nr_workers; + _wq_worker_start($self, $sigset, $fields, $one) for (1..$nr_workers); PublicInbox::DS::sig_setmask($sigset) unless $oldset; $self->{-wq_ppid} = $$; } -sub wq_worker_incr { # SIGTTIN handler - my ($self, $oldset, $fields) = @_; - $self->{-wq_s2} or return; - die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; - $self->ipc_atfork_prepare; - my $sigset = $oldset // PublicInbox::DS::block_signals(); - _wq_worker_start($self, $sigset, $fields); - PublicInbox::DS::sig_setmask($sigset) unless $oldset; -} - -sub wq_exit { # wakes up wq_worker_decr_wait - send($_[0]->{-wq_s2}, $$, MSG_EOR) // die "$$ send: $!"; - exit; -} - -sub wq_worker_decr { # SIGTTOU handler, kills first idle worker - my ($self) = @_; - return unless wq_workers($self); - die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; - $self->wq_io_do('wq_exit'); - # caller must call wq_worker_decr_wait in main loop -} - -sub wq_worker_decr_wait { - my ($self, $timeout, $cb, @args) = @_; - return if $self->{-wq_ppid} != $$; # can't reap siblings or parents - die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; - my $s1 = $self->{-wq_s1} // croak 'BUG: no wq_s1'; - vec(my $rin = '', fileno($s1), 1) = 1; - select(my $rout = $rin, undef, undef, $timeout) or - croak 'timed out waiting for wq_exit'; - recv($s1, my $pid, 64, 0) // croak "recv: $!"; - my $workers = $self->{-wq_workers} // croak 'BUG: no wq_workers'; - delete $workers->{$pid} // croak "BUG: PID:$pid invalid"; - dwaitpid($pid, $cb // \&ipc_worker_reap, [ $self, @args ]); -} - -# set or retrieve number of workers -sub wq_workers { - my ($self, $nr, $cb, @args) = @_; - my $cur = $self->{-wq_workers} or return; - if (defined $nr) { - while (scalar(keys(%$cur)) > $nr) { - $self->wq_worker_decr; - $self->wq_worker_decr_wait(undef, $cb, @args); - } - $self->wq_worker_incr while scalar(keys(%$cur)) < $nr; - } - scalar(keys(%$cur)); -} - sub wq_close { - my ($self, $nohang, $cb, @args) = @_; + my ($self) = @_; 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; - } -} - -sub wq_kill_old { - my ($self, $sig) = @_; - my $pids = $self->{"-wq_old_pids.$$"} or return; - kill($sig // 'TERM', @$pids); + return if $self->{-reap_async}; + my @pids = keys %{$self->{-wq_workers}}; + dwaitpid($_, \&ipc_worker_reap, [ $self ]) for @pids; } 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 () {