diff options
author | Eric Wong <e@80x24.org> | 2020-10-16 06:59:34 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-10-16 17:15:26 +0000 |
commit | 28704f95181f193e20856b7b52454e8cf0e57a57 (patch) | |
tree | e683742b2525ebc55d5f2938b27313368d08fd7d | |
parent | 2484555ea1a2b5d0af4be5840a92605d9dbb7930 (diff) | |
download | public-inbox-28704f95181f193e20856b7b52454e8cf0e57a57.tar.gz |
We need to loop the inflight check for nested callback invocations to ensure we don't clog the pipe that feeds `git cat-file'. This bug was obscured by the fact that we're already accounting for 64-char git OIDs with SHA-256 in the pipe space calculation; perhaps we shouldn't do that.
-rw-r--r-- | lib/PublicInbox/Git.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index eb5de159..e3a2bcb8 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -275,7 +275,7 @@ sub check_async_begin ($) { sub check_async ($$$$) { my ($self, $oid, $cb, $arg) = @_; my $inflight_c = $self->{inflight_c} // check_async_begin($self); - if (scalar(@$inflight_c) >= MAX_INFLIGHT) { + while (scalar(@$inflight_c) >= MAX_INFLIGHT) { check_async_step($self, $inflight_c); } print { $self->{out_c} } $oid, "\n" or fail($self, "write error: $!"); @@ -420,10 +420,9 @@ sub cat_async_begin { sub cat_async ($$$;$) { my ($self, $oid, $cb, $arg) = @_; my $inflight = $self->{inflight} // cat_async_begin($self); - if (scalar(@$inflight) >= MAX_INFLIGHT) { + while (scalar(@$inflight) >= MAX_INFLIGHT) { cat_async_step($self, $inflight); } - print { $self->{out} } $oid, "\n" or fail($self, "write error: $!"); push(@$inflight, $oid, $cb, $arg); } |