averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

object-file: hide internals when we need to reprepare loose sources

Browse Source 
There are two different situations where we have to clear the cache of
loose objects:

  - When freeing the loose object source itself to avoid memory leaks.

  - When repreparing the loose object source so that any potentially-
    stale data is getting evicted from the cache.

The former is already handled by `odb_source_loose_free()`. But the
latter case is still done manually by in `odb_reprepare()`, so we are
leaking internals into that code.

Introduce a new `odb_source_loose_reprepare()` function as an equivalent
to `packfile_store_prepare()` to hide these implementation details.
Furthermore, while at it, rename the function `odb_clear_loose_cache()`
to `odb_source_loose_clear()`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-11-03 08:42:02 +01:00
committed by Junio C Hamano
parent 90a93f9dea
commit be659c97ea
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
object-file.c
View File

@@ -1834,12 +1834,17 @@ struct oidtree *odb_source_loose_cache(struct odb_source *source,
return source->loose->cache; return source->loose->cache;
} }
void odb_clear_loose_cache(struct odb_source *source) static void odb_source_loose_clear_cache(struct odb_source_loose *loose)
{ {
oidtree_clear(source->loose->cache); oidtree_clear(loose->cache);
FREE_AND_NULL(source->loose->cache); FREE_AND_NULL(loose->cache);
memset(&source->loose->subdir_seen, 0, memset(&loose->subdir_seen, 0,
sizeof(source->loose->subdir_seen)); sizeof(loose->subdir_seen));
}
void odb_source_loose_reprepare(struct odb_source *source)
{
odb_source_loose_clear_cache(source->loose);
} }
static int check_stream_oid(git_zstream *stream, static int check_stream_oid(git_zstream *stream,
@@ -2008,6 +2013,6 @@ void odb_source_loose_free(struct odb_source_loose *loose)
{ {
if (!loose) if (!loose)
return; return;
odb_clear_loose_cache(loose->source); odb_source_loose_clear_cache(loose);
free(loose); free(loose);
} }

6
object-file.h
View File

@@ -37,6 +37,9 @@ struct odb_source_loose {
struct odb_source_loose *odb_source_loose_new(struct odb_source *source); struct odb_source_loose *odb_source_loose_new(struct odb_source *source);
void odb_source_loose_free(struct odb_source_loose *loose); void odb_source_loose_free(struct odb_source_loose *loose);
/* Reprepare the loose source by emptying the loose object cache. */
void odb_source_loose_reprepare(struct odb_source *source);
/* /*
* Populate and return the loose object cache array corresponding to the * Populate and return the loose object cache array corresponding to the
* given object ID. * given object ID.
@@ -44,9 +47,6 @@ void odb_source_loose_free(struct odb_source_loose *loose);
struct oidtree *odb_source_loose_cache(struct odb_source *source, struct oidtree *odb_source_loose_cache(struct odb_source *source,
const struct object_id *oid); const struct object_id *oid);
/* Empty the loose object cache for the specified object directory. */
void odb_clear_loose_cache(struct odb_source *source);
/* /*
* Put in `buf` the name of the file in the local object database that * Put in `buf` the name of the file in the local object database that
* would be used to store a loose object with the specified oid. * would be used to store a loose object with the specified oid.

2
odb.c
View File

@@ -1071,7 +1071,7 @@ void odb_reprepare(struct object_database *o)
odb_prepare_alternates(o); odb_prepare_alternates(o);
for (source = o->sources; source; source = source->next) for (source = o->sources; source; source = source->next)
odb_clear_loose_cache(source); odb_source_loose_reprepare(source);
o->approximate_object_count_valid = 0; o->approximate_object_count_valid = 0;