From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 6/7] ipc: move on_destroy scope to inside the eval
Date: Fri, 29 Jan 2021 12:42:59 +0500 [thread overview]
Message-ID: <20210129074300.14475-7-e@80x24.org> (raw)
In-Reply-To: <20210129074300.14475-1-e@80x24.org>
It saves us a line of code
---
lib/PublicInbox/IPC.pm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index ece0e8b8..d2ff038d 100644
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -119,13 +119,12 @@ sub ipc_worker_spawn {
PublicInbox::DS::sig_setmask($sigset);
# ensure we properly exit even if warn() dies:
my $end = PublicInbox::OnDestroy->new($$, sub { exit(!!$@) });
- my $on_destroy = $self->ipc_atfork_child;
eval {
+ my $on_destroy = $self->ipc_atfork_child;
local %SIG = %SIG;
ipc_worker_loop($self, $r_req, $w_res);
};
die "worker $ident PID:$$ died: $@\n" if $@;
- undef $on_destroy;
undef $end; # trigger exit
}
PublicInbox::DS::sig_setmask($sigset) unless $oldset;
@@ -336,13 +335,12 @@ sub _wq_worker_start ($$$) {
PublicInbox::DS::sig_setmask($oldset);
# ensure we properly exit even if warn() dies:
my $end = PublicInbox::OnDestroy->new($$, sub { exit(!!$@) });
- my $on_destroy = $self->ipc_atfork_child;
eval {
+ my $on_destroy = $self->ipc_atfork_child;
local %SIG = %SIG;
wq_worker_loop($self);
};
warn "worker $self->{-wq_ident} PID:$$ died: $@" if $@;
- undef $on_destroy;
undef $end; # trigger exit
} else {
$self->{-wq_workers}->{$pid} = \undef;
next prev parent reply other threads:[~2021-01-29 7:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 7:42 [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29 7:42 ` [PATCH 1/7] ipc: wq: support passing fields to workers Eric Wong
2021-01-29 7:42 ` [PATCH 2/7] lei_xsearch: drop repeated "Xapian" in error message Eric Wong
2021-01-29 7:42 ` [PATCH 3/7] ipc: more consistent behavior between worker types Eric Wong
2021-01-29 7:42 ` [PATCH 4/7] lei: less error-prone FD mapping Eric Wong
2021-01-29 7:42 ` [PATCH 5/7] git: synchronous cat_file may return type and OID Eric Wong
2021-01-29 7:42 ` Eric Wong [this message]
2021-01-29 7:43 ` [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210129074300.14475-7-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).