From: Johannes Altmanninger <aclopte@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH v7 6/7] pack-bitmap-write.c: don't return without stop_progress()
Date: Mon, 27 Dec 2021 02:11:48 +0100 [thread overview]
Message-ID: <20211227011148.rz57cgk3fovklz6i@gmail.com> (raw)
In-Reply-To: <patch-v7-6.7-776362de897-20211217T041945Z-avarab@gmail.com>
On Fri, Dec 17, 2021 at 05:25:01AM +0100, Ævar Arnfjörð Bjarmason wrote:
> Fix a bug that's been here since 7cc8f971085 (pack-objects: implement
> bitmap writing, 2013-12-21), we did not call stop_progress() if we
> reached the early exit in this function.
>
> We could call stop_progress() before we return, but better yet is to
> defer calling start_progress() until we need it.
Looks great.
>
> This will matter in a subsequent commit where we BUG(...) out if this happens,
"this" = "call start without stop"? Let's maybe be explicit here
(I guess the BUG() commit was postponed, but it doesn't hurt to mention it.)
> and matters now e.g. because we don't have a corresponding
> "region_end" for the progress trace2 event.
s/region_end/region_leave/
>
> Suggested-by: SZEDER Gábor <szeder.dev@gmail.com>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> pack-bitmap-write.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
> index 9c55c1531e1..cab3eaa2acd 100644
> --- a/pack-bitmap-write.c
> +++ b/pack-bitmap-write.c
> @@ -575,15 +575,15 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
>
> QSORT(indexed_commits, indexed_commits_nr, date_compare);
>
> - if (writer.show_progress)
> - writer.progress = start_progress("Selecting bitmap commits", 0);
> -
> if (indexed_commits_nr < 100) {
> for (i = 0; i < indexed_commits_nr; ++i)
> push_bitmapped_commit(indexed_commits[i]);
> return;
> }
>
> + if (writer.show_progress)
> + writer.progress = start_progress("Selecting bitmap commits", 0);
> +
> for (;;) {
> struct commit *chosen = NULL;
>
> --
> 2.34.1.1119.g7a3fc8778ee
>
next prev parent reply other threads:[~2021-12-27 1:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 4:24 [PATCH v7 0/7] progress: test fixes / cleanup Ævar Arnfjörð Bjarmason
2021-12-17 4:24 ` [PATCH v7 1/7] leak tests: fix a memory leaks in "test-progress" helper Ævar Arnfjörð Bjarmason
2021-12-27 1:07 ` Johannes Altmanninger
2021-12-17 4:24 ` [PATCH v7 2/7] progress.c test helper: add missing braces Ævar Arnfjörð Bjarmason
2021-12-17 4:24 ` [PATCH v7 3/7] progress.c tests: make start/stop commands on stdin Ævar Arnfjörð Bjarmason
2021-12-27 1:10 ` Johannes Altmanninger
2021-12-27 1:31 ` Ævar Arnfjörð Bjarmason
2021-12-17 4:24 ` [PATCH v7 4/7] progress.c tests: test some invalid usage Ævar Arnfjörð Bjarmason
2021-12-27 1:11 ` Johannes Altmanninger
2022-01-03 23:48 ` Junio C Hamano
2021-12-17 4:25 ` [PATCH v7 5/7] progress.c: add temporary variable from progress struct Ævar Arnfjörð Bjarmason
2021-12-27 1:11 ` Johannes Altmanninger
2021-12-17 4:25 ` [PATCH v7 6/7] pack-bitmap-write.c: don't return without stop_progress() Ævar Arnfjörð Bjarmason
2021-12-27 1:11 ` Johannes Altmanninger [this message]
2021-12-17 4:25 ` [PATCH v7 7/7] various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO) Ævar Arnfjörð Bjarmason
2021-12-27 1:17 ` Johannes Altmanninger
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211227011148.rz57cgk3fovklz6i@gmail.com \
--to=aclopte@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=szeder.dev@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).