From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/2] read-cache: fix incorrect count and progress bar stalling
Date: Mon, 7 Jun 2021 16:43:23 +0200 [thread overview]
Message-ID: <patch-2.2-042f598826-20210607T144206Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.2-0000000000-20210607T144206Z-avarab@gmail.com>
Fix a potential incorrect display of the number of items (off by one)
and stalling of the progress bar in refresh_index().
The off-by-one error is minor, we should say we're processing the 1st
item, not the 0th. This along with the next change also allows us to
remove the last display_progress() call outside the loop, as we'll
always have reached 100% now.
Let's also move the display_progress() call to the very start of the
loop refresh_index() loop. In the loop we first check whether e.g. we
ignore submodules and the entry we're processing is a submodule,
whether we ignore certain paths etc.. Thus we could have a
pathological case where we have a huge index consisting of such
ignored entries, and we'd stall on the progress bar.
See ae9af12287 (status: show progress bar if refreshing the index
takes too long, 2018-09-15) for the initial addition of this progress
bar to refresh_index().
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
read-cache.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 470f800855..8b0073a839 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1594,6 +1594,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
int t2_did_lstat = 0;
int t2_did_scan = 0;
+ display_progress(progress, i + 1);
+
ce = istate->cache[i];
if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
continue;
@@ -1627,7 +1629,6 @@ int refresh_index(struct index_state *istate, unsigned int flags,
t2_sum_scan += t2_did_scan;
if (new_entry == ce)
continue;
- display_progress(progress, i);
if (!new_entry) {
const char *fmt;
@@ -1662,7 +1663,6 @@ int refresh_index(struct index_state *istate, unsigned int flags,
trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat);
trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
trace2_region_leave("index", "refresh", NULL);
- display_progress(progress, istate->cache_nr);
stop_progress(&progress);
trace_performance_leave("refresh index");
return has_errors;
--
2.32.0.rc3.434.gd8aed1f08a7
next prev parent reply other threads:[~2021-06-07 14:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 14:43 [PATCH 0/2] trivial progress.c API usage fixes Ævar Arnfjörð Bjarmason
2021-06-07 14:43 ` [PATCH 1/2] read-cache.c: don't guard calls to progress.c API Ævar Arnfjörð Bjarmason
2021-06-07 15:28 ` Derrick Stolee
2021-06-07 15:52 ` Ævar Arnfjörð Bjarmason
2021-06-07 16:11 ` Derrick Stolee
2021-06-07 14:43 ` Ævar Arnfjörð Bjarmason [this message]
2021-06-07 15:31 ` [PATCH 2/2] read-cache: fix incorrect count and progress bar stalling Derrick Stolee
2021-06-07 15:58 ` Ævar Arnfjörð Bjarmason
2021-06-07 19:20 ` René Scharfe
2021-06-07 19:49 ` Ævar Arnfjörð Bjarmason
2021-06-07 23:41 ` Junio C Hamano
2021-06-08 10:58 ` Ævar Arnfjörð Bjarmason
2021-06-08 16:14 ` René Scharfe
2021-06-08 22:12 ` Ævar Arnfjörð Bjarmason
2021-06-10 5:30 ` Junio C Hamano
2021-06-10 15:14 ` René Scharfe
2021-06-10 15:14 ` René Scharfe
2021-06-14 11:07 ` Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` René Scharfe
2021-06-14 19:08 ` Ævar Arnfjörð Bjarmason
2021-06-15 2:32 ` Junio C Hamano
2021-06-15 15:14 ` René Scharfe
2021-06-15 16:46 ` Ævar Arnfjörð Bjarmason
2021-06-20 12:53 ` René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-2.2-042f598826-20210607T144206Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/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.
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 NNTP newsgroup(s).