From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/4] git: reduce delete ops in _destroy
Date: Wed, 25 Jan 2023 10:18:35 +0000 [thread overview]
Message-ID: <20230125101835.882567-5-e@80x24.org> (raw)
In-Reply-To: <20230125101835.882567-1-e@80x24.org>
We can avoid some extra returns and branches by just relying on
variadic arguments.
---
lib/PublicInbox/Git.pm | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 9197ea67..12f997dc 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -373,13 +373,11 @@ sub check {
}
sub _destroy {
- my ($self, $rbuf, $in, $out, $pid, $err) = @_;
- delete @$self{($rbuf, $in, $out)};
- delete $self->{$err} if $err; # `err_c'
+ my ($self, $pid, @rest) = @_; # rest = rbuf, in, out, err
+ my ($p) = delete @$self{($pid, @rest)};
# GitAsyncCat::event_step may delete {$pid}
- my $p = delete($self->{$pid}) // return;
- awaitpid($p) if $$ == $self->{"$pid.owner"};
+ awaitpid($p) if defined($p) && $$ == $self->{"$pid.owner"};
}
sub async_abort ($) {
@@ -468,8 +466,8 @@ sub cleanup {
async_wait_all($self);
delete $self->{inflight};
delete $self->{inflight_c};
- _destroy($self, qw(rbuf in out pid));
- _destroy($self, qw(rbuf_c in_c out_c pid_c err_c));
+ _destroy($self, qw(pid rbuf in out));
+ _destroy($self, qw(pid_c rbuf_c in_c out_c err_c));
undef;
}
prev parent reply other threads:[~2023-01-25 10:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 10:18 [PATCH 0/4] git-related updates Eric Wong
2023-01-25 10:18 ` [PATCH 1/4] git: use core.abbrev=no on git 2.31+ Eric Wong
2023-01-25 10:18 ` [PATCH 2/4] process_pipe: warn hackers off using it for bidirectional pipes Eric Wong
2023-01-25 10:18 ` [PATCH 3/4] git: drop needless ENOENT import Eric Wong
2023-01-25 10:18 ` Eric Wong [this message]
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=20230125101835.882567-5-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).