user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] git: introduce async_wait_all
Date: Sat, 17 Oct 2020 08:04:24 +0000	[thread overview]
Message-ID: <20201017080424.4590-1-e@80x24.org> (raw)

->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.
---
 lib/PublicInbox/Git.pm        | 14 ++++++++++++--
 lib/PublicInbox/SearchIdx.pm  |  3 +--
 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});
 }
 

                 reply	other threads:[~2020-10-17  8:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20201017080424.4590-1-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).