diff options
author | Eric Wong <e@80x24.org> | 2020-10-17 08:04:24 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-10-17 19:52:50 +0000 |
commit | 2686f6e69245aa32f9c2a286475ed91db776b065 (patch) | |
tree | 5cdf184c4d738d18ddfbcf5c1042f52001b83742 /lib | |
parent | c51b6340a05cf11f7b0b3bb978288ade2f930c4a (diff) | |
download | public-inbox-2686f6e69245aa32f9c2a286475ed91db776b065.tar.gz |
->cat_async and ->check_async may trigger each other (in future callers) while waiting, so we need a unified method to ensure both complete. This doesn't affect current code, but allows us to slightly simplify existing callers.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/PublicInbox/Git.pm | 14 | ||||
-rw-r--r-- | lib/PublicInbox/SearchIdx.pm | 3 | ||||
-rw-r--r-- | lib/PublicInbox/V2Writable.pm | 3 |
3 files changed, 14 insertions, 6 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index e3a2bcb8..86343ac9 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -352,13 +352,23 @@ sub qx { <$fh> } +# check_async and cat_async may trigger the other, so ensure they're +# both completely done by using this: +sub async_wait_all ($) { + my ($self) = @_; + while (scalar(@{$self->{inflight_c} // []}) || + scalar(@{$self->{inflight} // []})) { + $self->check_async_wait; + $self->cat_async_wait; + } +} + # returns true if there are pending "git cat-file" processes sub cleanup { my ($self) = @_; local $in_cleanup = 1; delete $self->{async_cat}; - check_async_wait($self); - cat_async_wait($self); + async_wait_all($self); delete $self->{inflight}; delete $self->{inflight_c}; _destroy($self, qw(cat_rbuf in out pid)); diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 2c5c815f..2aec2b73 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -587,8 +587,7 @@ sub check_size { # check_async cb for -index --max-size=... sub v1_checkpoint ($$;$) { my ($self, $sync, $stk) = @_; - $self->{ibx}->git->check_async_wait; - $self->{ibx}->git->cat_async_wait; + $self->{ibx}->git->async_wait_all; # latest_cmt may be undef my $newest = $stk ? $stk->{latest_cmt} : undef; diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 534cd7dc..c04f0c59 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1228,8 +1228,7 @@ sub index_epoch ($$$) { reindex_checkpoint($self, $sync); } } - $all->check_async_wait; - $all->cat_async_wait; + $all->async_wait_all; update_last_commit($self, $git, $i, $stk->{latest_cmt}); } |