From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, gitster@pobox.com, jonathantanmy@google.com,
stolee@gmail.com
Subject: Re: [PATCH v4 8/9] midx: read `RIDX` chunk when present
Date: Wed, 26 Jan 2022 16:10:08 +0100 [thread overview]
Message-ID: <220126.86lez2edae.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <94563cf038722852d801bd0a8e744a569799f354.1643150456.git.me@ttaylorr.com>
On Tue, Jan 25 2022, Taylor Blau wrote:
> @@ -298,9 +298,26 @@ int load_midx_revindex(struct multi_pack_index *m)
> {
> struct strbuf revindex_name = STRBUF_INIT;
> int ret;
> +
nit: good addition for style in general, but a stay whitespace change in
an otherwise narrowly focused patch.
> if (m->revindex_data)
> return 0;
>
> + if (m->chunk_revindex) {
> + /*
> + * If the MIDX `m` has a `RIDX` chunk, then use its contents for
> + * the reverse index instead of trying to load a separate `.rev`
> + * file.
> + *
> + * Note that we do *not* set `m->revindex_map` here, since we do
> + * not want to accidentally call munmap() in the middle of the
> + * MIDX.
> + */
> + trace2_data_string("load_midx_revindex", the_repository,
> + "source", "midx");
> + m->revindex_data = (const uint32_t *)m->chunk_revindex;
> + return 0;
> + }
> +
> trace2_data_string("load_midx_revindex", the_repository,
> "source", "rev");
This trace2_data_string() is repeated with just "midx" v.s. "rev"
parameters.
I was going to suggest that maybe we should add a "goto" here, since
you're trying to juggle the early return and logging this.
But wouldn't this be both simpler and give you better logging if it was
the usual region start/end pattern, with just the "data string"
in-between?
Then you'd get both performance data on the index loading, and the
source.
Or maybe it's overkill in this case, I don't know...
next prev parent reply other threads:[~2022-01-26 15:18 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 19:26 [PATCH 0/2] midx: prevent bitmap corruption when permuting pack order Taylor Blau
2021-12-08 19:26 ` [PATCH 1/2] t5326: demonstrate bitmap corruption after permutation Taylor Blau
2021-12-08 19:26 ` [PATCH 2/2] midx.c: make changing the preferred pack safe Taylor Blau
2021-12-08 19:30 ` [PATCH 0/2] midx: prevent bitmap corruption when permuting pack order Derrick Stolee
2021-12-08 19:55 ` Jeff King
2021-12-10 18:36 ` Taylor Blau
2021-12-10 22:31 ` Taylor Blau
2021-12-11 1:39 ` Taylor Blau
2021-12-13 14:00 ` Derrick Stolee
2021-12-13 14:31 ` Taylor Blau
2021-12-14 1:55 ` [PATCH v2 0/8] " Taylor Blau
2021-12-14 1:55 ` [PATCH v2 1/8] t5326: demonstrate bitmap corruption after permutation Taylor Blau
2021-12-14 1:55 ` [PATCH v2 2/8] midx.c: make changing the preferred pack safe Taylor Blau
2021-12-14 1:55 ` [PATCH v2 3/8] pack-revindex.c: instrument loading on-disk reverse index Taylor Blau
2021-12-14 1:55 ` [PATCH v2 4/8] t5326: drop unnecessary setup Taylor Blau
2021-12-14 1:55 ` [PATCH v2 5/8] t5326: extract `test_rev_exists` Taylor Blau
2021-12-20 18:33 ` Derrick Stolee
2022-01-04 15:33 ` Taylor Blau
2021-12-14 1:55 ` [PATCH v2 6/8] t5326: move tests to t/lib-bitmap.sh Taylor Blau
2021-12-14 1:55 ` [PATCH v2 7/8] t/lib-bitmap.sh: parameterize tests over reverse index source Taylor Blau
2021-12-14 1:55 ` [PATCH v2 8/8] midx: read `RIDX` chunk when present Taylor Blau
2021-12-20 18:42 ` Derrick Stolee
2022-01-04 15:21 ` Taylor Blau
2021-12-15 19:46 ` [PATCH v2 0/8] midx: prevent bitmap corruption when permuting pack order Junio C Hamano
2021-12-15 21:37 ` Taylor Blau
2021-12-15 22:17 ` Junio C Hamano
2021-12-15 22:55 ` Junio C Hamano
2021-12-20 18:51 ` Derrick Stolee
2021-12-20 19:52 ` Taylor Blau
2021-12-20 20:09 ` Derrick Stolee
2021-12-15 22:58 ` Junio C Hamano
2021-12-15 23:01 ` Taylor Blau
2022-01-04 18:15 ` [PATCH v3 0/9] " Taylor Blau
2022-01-04 18:15 ` [PATCH v3 1/9] t5326: demonstrate bitmap corruption after permutation Taylor Blau
2022-01-20 17:55 ` Jonathan Tan
2022-01-20 22:11 ` Taylor Blau
2022-01-20 22:41 ` Junio C Hamano
2022-01-20 22:46 ` Taylor Blau
2022-01-24 17:40 ` Jonathan Tan
2022-01-04 18:15 ` [PATCH v3 2/9] midx.c: make changing the preferred pack safe Taylor Blau
2022-01-14 21:35 ` Junio C Hamano
2022-01-14 21:43 ` Junio C Hamano
2022-01-15 0:59 ` Taylor Blau
2022-01-15 6:27 ` Junio C Hamano
2022-01-20 18:08 ` Jonathan Tan
2022-01-20 22:13 ` Taylor Blau
2022-01-04 18:15 ` [PATCH v3 3/9] pack-revindex.c: instrument loading on-disk reverse index Taylor Blau
2022-01-20 18:15 ` Jonathan Tan
2022-01-20 22:18 ` Taylor Blau
2022-01-24 17:53 ` Jonathan Tan
2022-01-04 18:15 ` [PATCH v3 4/9] t5326: drop unnecessary setup Taylor Blau
2022-01-04 18:15 ` [PATCH v3 5/9] t5326: extract `test_rev_exists` Taylor Blau
2022-01-04 18:15 ` [PATCH v3 6/9] t5326: move tests to t/lib-bitmap.sh Taylor Blau
2022-01-04 18:15 ` [PATCH v3 7/9] t/lib-bitmap.sh: parameterize tests over reverse index source Taylor Blau
2022-01-24 19:15 ` Jonathan Tan
2022-01-25 21:40 ` Taylor Blau
2022-01-26 21:00 ` Jonathan Tan
2022-01-04 18:16 ` [PATCH v3 8/9] midx: read `RIDX` chunk when present Taylor Blau
2022-01-24 19:27 ` Jonathan Tan
2022-01-25 21:45 ` Taylor Blau
2022-01-26 21:28 ` Jonathan Tan
2022-01-04 18:16 ` [PATCH v3 9/9] pack-bitmap.c: gracefully fallback after opening pack/MIDX Taylor Blau
2022-01-24 19:29 ` Jonathan Tan
2022-01-25 21:46 ` Taylor Blau
2022-01-25 22:40 ` [PATCH v4 0/9] midx: prevent bitmap corruption when permuting pack order Taylor Blau
2022-01-25 22:41 ` [PATCH v4 1/9] t5326: demonstrate bitmap corruption after permutation Taylor Blau
2022-01-26 15:01 ` Ævar Arnfjörð Bjarmason
2022-01-26 20:18 ` Taylor Blau
2022-01-25 22:41 ` [PATCH v4 2/9] midx.c: make changing the preferred pack safe Taylor Blau
2022-01-25 22:41 ` [PATCH v4 3/9] pack-revindex.c: instrument loading on-disk reverse index Taylor Blau
2022-01-26 15:03 ` Ævar Arnfjörð Bjarmason
2022-01-25 22:41 ` [PATCH v4 4/9] t5326: drop unnecessary setup Taylor Blau
2022-01-25 22:41 ` [PATCH v4 5/9] t5326: extract `test_rev_exists` Taylor Blau
2022-01-26 15:04 ` Ævar Arnfjörð Bjarmason
2022-01-26 20:19 ` Taylor Blau
2022-01-25 22:41 ` [PATCH v4 6/9] t5326: move tests to t/lib-bitmap.sh Taylor Blau
2022-01-25 22:41 ` [PATCH v4 7/9] t/lib-bitmap.sh: parameterize tests over reverse index source Taylor Blau
2022-01-25 22:41 ` [PATCH v4 8/9] midx: read `RIDX` chunk when present Taylor Blau
2022-01-26 15:10 ` Ævar Arnfjörð Bjarmason [this message]
2022-01-26 20:23 ` Taylor Blau
2022-01-25 22:41 ` [PATCH v4 9/9] pack-bitmap.c: gracefully fallback after opening pack/MIDX Taylor Blau
2022-01-26 15:08 ` Ævar Arnfjörð Bjarmason
2022-01-26 17:50 ` [PATCH v4 0/9] midx: prevent bitmap corruption when permuting pack order Ævar Arnfjörð Bjarmason
2022-01-26 20:24 ` Taylor Blau
2022-01-27 17:15 ` Jonathan Tan
2022-02-24 22:50 ` Taylor Blau
2022-01-27 14:13 ` Derrick Stolee
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=220126.86lez2edae.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=stolee@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).