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,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE 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 4DF911F461 for ; Thu, 9 Nov 2023 10:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1699524587; bh=X6nQ9oVcJPq0UHpaA9tCssWoluDsas/8Lyzvq6NowvA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Bm5u+sOYgh6LDVQ9v89JMju+paQqLXpCd510axPvNZR4wBxSOqmod2V07CX2WXjXf 3hznyRHXsqKU9rfPW0FOFgCUgADoayL/yuSAoQwDOCTa4PAGB9sVpE/sc9+MapTl/n 2dUrE76W/cvoSte+XWA9iGaQ3Z8vuWzphxL6oFfE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 02/13] lei: use cached $daemon_pid when possible Date: Thu, 9 Nov 2023 10:09:35 +0000 Message-ID: <20231109100946.1440611-3-e@80x24.org> In-Reply-To: <20231109100946.1440611-1-e@80x24.org> References: <20231109100946.1440611-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: ->lei_daemon_pid can only be called in the top-level daemon process when $daemon_pid is valid, so avoid a getpid(2) syscall in those cases. --- lib/PublicInbox/LEI.pm | 2 +- lib/PublicInbox/LeiUp.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 2832db63..f32e5bbc 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -927,7 +927,7 @@ sub _config { run_wait($cmd, \%env, \%opt) ? ($err_ok ? undef : fail($self, $?)) : 1; } -sub lei_daemon_pid { puts shift, $$ } +sub lei_daemon_pid { puts shift, $daemon_pid } sub lei_daemon_kill { my ($self) = @_; diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm index cd2337b4..0faa180d 100644 --- a/lib/PublicInbox/LeiUp.pm +++ b/lib/PublicInbox/LeiUp.pm @@ -11,6 +11,7 @@ use PublicInbox::LeiSavedSearch; # OverIdx use PublicInbox::DS; use PublicInbox::PktOp; use PublicInbox::LeiFinmsg; +use PublicInbox::LEI; my $REMOTE_RE = qr!\A(?:imap|http)s?://!i; # http(s) will be for JMAP sub up1 ($$) { @@ -92,7 +93,6 @@ sub redispatch_all ($$) { $op_c->{ops} = { '' => [ $lei->can('dclose'), $lei ] }; my @first_batch = splice(@$upq, 0, $j); # initial parallelism $lei->{-upq} = $upq; - $lei->{daemon_pid} = $$; $lei->event_step_init; # wait for client disconnects for my $out (@first_batch) { PublicInbox::DS::requeue( @@ -212,8 +212,8 @@ sub event_step { # runs via PublicInbox::DS::requeue sub DESTROY { my ($self) = @_; + return if ($PublicInbox::LEI::daemon_pid // -1) != $$; my $lei = $self->{lei}; # the original, from lei_up - return if $lei->{daemon_pid} != $$; my $sock = delete $self->{unref_on_destroy}; my $s = $lei->{-socks} // []; @$s = grep { $_ != $sock } @$s;