ipc: drop unused $args from ->ipc_worker_stop

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

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 7486267322b082f6d326a20bb03b3a02189e8726..34e401185e92906e9e3762e849c86783412c2496 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -150,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;
@@ -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) {
@@ -181,7 +180,7 @@ sub ipc_worker_stop {
        $w_req = $r_res = undef;
 
        return if $$ != $ppid;
-       dwaitpid($pid, \&ipc_worker_reap, [$self, $args]);
+       dwaitpid($pid, \&ipc_worker_reap, [$self]);
 }
 
 # use this if we have multiple readers reading curl or "pigz -dc"
@@ -350,7 +349,7 @@ sub wq_do {
 
 sub prepare_nonblock {
        ($_[0]->{-wq_s1} // die 'BUG: no {-wq_s1}')->blocking(0);
-       $_[0]->{-reap_async} or die 'BUG: {-reap_async} needed for nonblock';
+       $_[0]->{-reap_do} or die 'BUG: {-reap_do} needed for nonblock';
        require PublicInbox::WQBlocked;
 }
 
@@ -424,11 +423,11 @@ sub wq_workers_start {
 sub wq_close {
        my ($self) = @_;
        if (my $wqb = delete $self->{wqb}) {
-               $self->{-reap_async} or die 'BUG: {-reap_async} unset';
+               $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;
 }