From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/5] git: rename `_active' sub to `cat_active'
Date: Wed, 14 Aug 2024 00:16:41 +0000 [thread overview]
Message-ID: <20240814001645.395576-2-e@80x24.org> (raw)
In-Reply-To: <20240814001645.395576-1-e@80x24.org>
Having an underscore prefix is confusing for a public
subroutine, and the `cat_' prefix makes it obvious it isn't
some other command.
---
lib/PublicInbox/Git.pm | 6 +++---
lib/PublicInbox/LeiStore.pm | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 32c11a59..dd0a14e9 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -457,7 +457,7 @@ sub date_parse {
} $self->qx('rev-parse', map { "--since=$_" } @_);
}
-sub _active ($) {
+sub cat_active ($) {
scalar(@{gcf_inflight($_[0]) // []}) ||
($_[0]->{ck} && scalar(@{gcf_inflight($_[0]->{ck}) // []}))
}
@@ -466,7 +466,7 @@ sub _active ($) {
# both completely done by using this:
sub async_wait_all ($) {
my ($self) = @_;
- while (_active($self)) {
+ while (cat_active($self)) {
check_async_wait($self);
cat_async_wait($self);
}
@@ -475,7 +475,7 @@ sub async_wait_all ($) {
# returns true if there are pending "git cat-file" processes
sub cleanup {
my ($self, $lazy) = @_;
- ($lazy && _active($self)) and
+ ($lazy && cat_active($self)) and
return $self->{epwatch} ? watch_async($self) : 1;
local $in_cleanup = 1;
async_wait_all($self);
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index b2da2bc3..f9e8267b 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -573,7 +573,7 @@ sub set_xvmd {
sub check_done {
my ($self) = @_;
- $self->git->_active ?
+ $self->git->cat_active ?
add_uniq_timer("$self-check_done", 5, \&check_done, $self) :
done($self);
}
next prev parent reply other threads:[~2024-08-14 0:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 0:16 [PATCH 0/5] lei import-related fixes + diagnostics Eric Wong
2024-08-14 0:16 ` Eric Wong [this message]
2024-08-14 0:16 ` [PATCH 2/5] lei_store: use autodie for open+close Eric Wong
2024-08-14 0:16 ` [PATCH 3/5] v2writable: confess on broken {idx_shards} Eric Wong
2024-08-14 0:16 ` [PATCH 4/5] lei_search: make missing Xapian docs for kw lookups Eric Wong
2024-08-14 0:16 ` [PATCH 5/5] net_reader: improve IMAP error reporting Eric Wong
2024-11-19 21:51 ` [PATCH 0/5] lei import-related fixes + diagnostics Eric Wong
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=20240814001645.395576-2-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).