From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9030A1F59D for ; Tue, 17 Jan 2023 07:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1673939951; bh=ImYNIy3ONiCc7h5lXMgAHLPSrbF/xsptAUC6KXR5pFc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fq3TUxrp7WMzj6/VCEoNFJxPp55VzHxYFrnqC+2Lqbm/Ak1Csx7K4/VgI4ADuzCNu fSqHovBwabozYGaIDW2vpBkS+DRVZSwPsT5f1ojXE3eAgOiCfj6fIrkxqexDsHZFEc kJ1NEIRnou9oFdZOGClxpAzL6lFJvct/+Eh5toMI= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 01/12] ipc: remove {-reap_async} field Date: Tue, 17 Jan 2023 07:19:00 +0000 Message-Id: <20230117071911.1577890-2-e@80x24.org> In-Reply-To: <20230117071911.1577890-1-e@80x24.org> References: <20230117071911.1577890-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can just test for {-reap_do}, instead to save us a few bytes. --- lib/PublicInbox/IPC.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 74862673..671ad5d5 100644 --- 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; @@ -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; }