From cc37f7c9858d46638a0eea7333912f74c05cb708 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 25 Jan 2023 10:18:35 +0000 Subject: git: reduce delete ops in _destroy 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; } -- cgit v1.2.3-24-ge0c7