From: Jonathan Tan <jonathantanmy@google.com>
To: christian.couder@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com, peff@peff.net,
chriscool@tuxfamily.org, ramsay@ramsayjones.plus.com,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [RFC PATCH 05/10] pack-bitmap: don't rely on bitmap_git->reuse_objects
Date: Thu, 10 Oct 2019 16:44:08 -0700 [thread overview]
Message-ID: <20191010234408.170356-1-jonathantanmy@google.com> (raw)
In-Reply-To: <20190913130226.7449-6-chriscool@tuxfamily.org>
> As we now allocate 2 more words than necessary for each
> bitmap to serve as marks telling us that we can stop
> iterating over the words, we don't need to rely on
> bitmap_git->reuse_objects to stop iterating over the words.
As Peff states [1], this justification is probably incorrect as well.
The actual justification seems to be that we will no longer compute
reuse_objects (in a future patch), so we cannot rely on it anymore to
terminate the loop early; we have to iterate to the end.
[1] https://public-inbox.org/git/20191002155721.GD6116@sigill.intra.peff.net/
> @@ -622,7 +622,7 @@ static void show_objects_for_type(
> enum object_type object_type,
> show_reachable_fn show_reach)
> {
> - size_t pos = 0, i = 0;
> + size_t i = 0;
> uint32_t offset;
>
> struct ewah_iterator it;
> @@ -630,13 +630,15 @@ static void show_objects_for_type(
>
> struct bitmap *objects = bitmap_git->result;
>
> - if (bitmap_git->reuse_objects == bitmap_git->pack->num_objects)
> - return;
> -
> ewah_iterator_init(&it, type_filter);
>
> - while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
> + for (i = 0; i < objects->word_alloc &&
> + ewah_iterator_next(&filter, &it); i++) {
> eword_t word = objects->words[i] & filter;
> + size_t pos = (i * BITS_IN_EWORD);
> +
> + if (!word)
> + continue;
Here, iteration is not terminated when we see a 0. We just proceed to
the next one.
next prev parent reply other threads:[~2019-10-10 23:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 13:02 [RFC PATCH 00/10] Rewrite packfile reuse code Christian Couder
2019-09-13 13:02 ` [RFC PATCH 01/10] builtin/pack-objects: report reused packfile objects Christian Couder
2019-09-13 13:02 ` [RFC PATCH 02/10] packfile: expose get_delta_base() Christian Couder
2019-09-13 13:02 ` [RFC PATCH 03/10] ewah/bitmap: introduce bitmap_word_alloc() Christian Couder
2019-09-13 13:02 ` [RFC PATCH 04/10] ewah/bitmap: always allocate 2 more words Christian Couder
2019-10-10 23:40 ` Jonathan Tan
2019-10-11 7:49 ` Christian Couder
2019-10-11 18:05 ` Jeff King
2019-09-13 13:02 ` [RFC PATCH 05/10] pack-bitmap: don't rely on bitmap_git->reuse_objects Christian Couder
2019-10-10 23:44 ` Jonathan Tan [this message]
2019-10-11 7:50 ` Christian Couder
2019-09-13 13:02 ` [RFC PATCH 06/10] pack-bitmap: introduce bitmap_walk_contains() Christian Couder
2019-09-13 13:02 ` [RFC PATCH 07/10] csum-file: introduce hashfile_total() Christian Couder
2019-09-13 13:02 ` [RFC PATCH 08/10] pack-objects: introduce pack.allowPackReuse Christian Couder
2019-09-13 21:37 ` Junio C Hamano
2019-09-13 13:02 ` [RFC PATCH 09/10] builtin/pack-objects: introduce obj_is_packed() Christian Couder
2019-09-13 13:02 ` [RFC PATCH 10/10] pack-objects: improve partial packfile reuse Christian Couder
2019-09-13 22:29 ` Junio C Hamano
2019-09-14 2:02 ` Jeff King
2019-09-14 3:06 ` Junio C Hamano
2019-10-02 15:57 ` Jeff King
2019-10-03 2:06 ` Junio C Hamano
2019-10-03 6:55 ` Christian Couder
2019-10-10 23:59 ` Jonathan Tan
2019-10-11 7:39 ` Christian Couder
2019-10-11 18:01 ` Jeff King
2019-10-11 21:04 ` Jonathan Tan
2019-10-12 0:04 ` Junio C Hamano
2019-10-13 7:38 ` Jeff King
2019-10-17 7:03 ` Junio C Hamano
2019-10-17 7:23 ` Jeff King
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=20191010234408.170356-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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).