git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 9/9] midx: add repository to `multi_pack_index` struct

From
Taylor Blau <me@ttaylorr.com>
Date
Oct 30, 2024, 20:13 UTC
Message-ID
<ZyKTTYGPDQ0SWJCZ@nand.local>
In-Reply-To
<c0b386412d5c464aa838dbe7c7679d4c8618a2c7.1730297934.git.karthik.188@gmail.com>
On Wed, Oct 30, 2024 at 03:32:34PM +0100, Karthik Nayak wrote:
Show 38 quoted lines
> The `multi_pack_index` struct represents the MIDX for a repository.
> Here, we add a pointer to the repository in this struct, allowing direct
> use of the repository variable without relying on the global
> `the_repository` struct.
>
> With this addition, we can determine the repository associated with a
> `bitmap_index` struct. A `bitmap_index` points to either a `packed_git`
> or a `multi_pack_index`, both of which have direct repository
> references. To support this, we introduce a static helper function,
> `bitmap_repo`, in `pack-bitmap.c`, which retrieves a repository given a
> `bitmap_index`.
>
> With this, we clear up all usages of `the_repository` within
> `pack-bitmap.c` and also remove the `USE_THE_REPOSITORY_VARIABLE`
> definition. Bringing us another step closer to remove all global
> variable usage.
>
> Although this change also opens up the potential to clean up `midx.c`,
> doing so would require additional refactoring to pass the repository
> struct to functions where the MIDX struct is created: a task better
> suited for future patches.
>
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
> ---
>  midx.c        |  1 +
>  midx.h        |  3 ++
>  pack-bitmap.c | 97 +++++++++++++++++++++++++++++++--------------------
>  3 files changed, 64 insertions(+), 37 deletions(-)
>
> diff --git a/midx.c b/midx.c
> index 8edb75f51d..7a34473010 100644
> --- a/midx.c
> +++ b/midx.c
> @@ -131,6 +131,7 @@ static struct multi_pack_index *load_multi_pack_index_one(const char *object_dir
>  	m->data = midx_map;
>  	m->data_len = midx_size;
>  	m->local = local;
> +	m->r = the_repository;
Same note here about calling this 'r' rather than 'repo'.

I do wonder if it creates any awkwardness to have the_repository assigned here unconditionally when we do specify the object_dir. I think it's OK so long as we don't start replacing 'm->object_dir' with 'm->repo->objects->odb->path'.

Show 28 quoted lines
> @@ -1980,18 +1997,23 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
>  	if (!use_boundary_traversal)
>  		object_array_clear(&revs->pending);
>
> +	repo = bitmap_repo(bitmap_git);
> +
>  	if (haves) {
> -		if (use_boundary_traversal) {
> -			trace2_region_enter("pack-bitmap", "haves/boundary", the_repository);
> +		if (use_boundary_traversal)
> +		{
> +			trace2_region_enter("pack-bitmap", "haves/boundary", repo);
>  			haves_bitmap = find_boundary_objects(bitmap_git, revs, haves);
> -			trace2_region_leave("pack-bitmap", "haves/boundary", the_repository);
> -		} else {
> -			trace2_region_enter("pack-bitmap", "haves/classic", the_repository);
> +			trace2_region_leave("pack-bitmap", "haves/boundary", repo);
> +		}
> +		else
> +		{
> +			trace2_region_enter("pack-bitmap", "haves/classic", repo);
>  			revs->ignore_missing_links = 1;
>  			haves_bitmap = find_objects(bitmap_git, revs, haves, NULL);
>  			reset_revision_walk();
>  			revs->ignore_missing_links = 0;
> -			trace2_region_leave("pack-bitmap", "haves/classic", the_repository);
> +			trace2_region_leave("pack-bitmap", "haves/classic", repo);
>  		}
Odd braces?

Thanks, Taylor

Previous: Karthik NayakNext: karthik nayak
Message 12 of 13 in “packfile: avoid using the 'the_repository' global variable”
  1. 0/9 packfile: avoid using the 'the_repository' global variableKarthik Nayak, Oct 30, 2024
  2. 1/9 packfile: add repository to struct `packed_git`Karthik Nayak, Oct 30, 2024
  3. Taylor BlauOct 30, 2024
  4. 3/9 packfile: pass `repository` to static function in the fileKarthik Nayak, Oct 30, 2024
  5. 2/9 packfile: use `repository` from `packed_git` directlyKarthik Nayak, Oct 30, 2024
  6. 4/9 packfile: pass down repository to `odb_pack_name`Karthik Nayak, Oct 30, 2024
  7. 5/9 packfile: pass down repository to `has_object[_kept]_pack`Karthik Nayak, Oct 30, 2024
  8. 7/9 config: make `delta_base_cache_limit` a non-global variableKarthik Nayak, Oct 30, 2024
  9. 8/9 config: make `packed_git_(limit|window_size)` non-global variablesKarthik Nayak, Oct 30, 2024
  10. 6/9 packfile: pass down repository to `for_each_packed_object`Karthik Nayak, Oct 30, 2024
  11. 9/9 midx: add repository to `multi_pack_index` structKarthik Nayak, Oct 30, 2024
  12. Taylor BlauOct 30, 2024
  13. karthik nayakOct 31, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.