[PATCH 11/16] odb/source-packed: wire up `count_objects()` callback
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jun 4, 2026, 11:25 UTC
- Message-ID
- <20260604-pks-odb-source-packed-v1-11-2e7ab31b4b5c@pks.im>
- In-Reply-To
- <20260604-pks-odb-source-packed-v1-0-2e7ab31b4b5c@pks.im>
Move `packfile_store_count_objects()` from "packfile.c" into "odb/source-packed.c" and wire it up as the `count_objects()` callback of the "packed" source.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- odb/source-files.c | 2 +- odb/source-packed.c | 34 ++++++++++++++++++++++++++++++++++ packfile.c | 31 ------------------------------- packfile.h | 10 ---------- 4 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/odb/source-files.c b/odb/source-files.c index c73a7e5f90..274923e0ba 100644 --- a/odb/source-files.c +++ b/odb/source-files.c @@ -103,7 +103,7 @@ static int odb_source_files_count_objects(struct odb_source *source, unsigned long count; int ret; - ret = packfile_store_count_objects(files->packed, flags, &count); + ret = odb_source_count_objects(&files->packed->base, flags, &count); if (ret < 0) goto out; diff --git a/odb/source-packed.c b/odb/source-packed.c index a61c809c8c..013d8a50f8 100644 --- a/odb/source-packed.c +++ b/odb/source-packed.c @@ -338,6 +338,39 @@ static int odb_source_packed_for_each_object(struct odb_source *source, return ret; } +static int odb_source_packed_count_objects(struct odb_source *source, + enum odb_count_objects_flags flags UNUSED, + unsigned long *out) +{ + struct odb_source_packed *packed = odb_source_packed_downcast(source); + struct packfile_list_entry *e; + struct multi_pack_index *m; + unsigned long count = 0; + int ret; + + m = get_multi_pack_index(&packed->files->base); + if (m) + count += m->num_objects + m->num_objects_in_base; + + for (e = packfile_store_get_packs(packed); e; e = e->next) { + if (e->pack->multi_pack_index) + continue; + if (open_pack_index(e->pack)) { + ret = -1; + goto out; + } + + count += e->pack->num_objects; + } + + *out = count; + ret = 0; + +out: + return ret; +} + + void (*report_garbage)(unsigned seen_bits, const char *path); static void report_helper(const struct string_list *list, @@ -549,6 +582,7 @@ struct odb_source_packed *odb_source_packed_new(struct odb_source_files *parent) packed->base.read_object_info = odb_source_packed_read_object_info; packed->base.read_object_stream = odb_source_packed_read_object_stream; packed->base.for_each_object = odb_source_packed_for_each_object; + packed->base.count_objects = odb_source_packed_count_objects; if (!is_absolute_path(parent->base.path)) chdir_notify_register(NULL, odb_source_packed_reparent, packed); diff --git a/packfile.c b/packfile.c index 95136b050b..5cb14b28de 100644 --- a/packfile.c +++ b/packfile.c @@ -949,37 +949,6 @@ struct packfile_list_entry *packfile_store_get_packs(struct odb_source_packed *s return store->packs.head; } -int packfile_store_count_objects(struct odb_source_packed *store, - enum odb_count_objects_flags flags UNUSED, - unsigned long *out) -{ - struct packfile_list_entry *e; - struct multi_pack_index *m; - unsigned long count = 0; - int ret; - - m = get_multi_pack_index(&store->files->base); - if (m) - count += m->num_objects + m->num_objects_in_base; - - for (e = packfile_store_get_packs(store); e; e = e->next) { - if (e->pack->multi_pack_index) - continue; - if (open_pack_index(e->pack)) { - ret = -1; - goto out; - } - - count += e->pack->num_objects; - } - - *out = count; - ret = 0; - -out: - return ret; -} - unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, size_t *sizep) { diff --git a/packfile.h b/packfile.h index 210650923f..9f5b5c145a 100644 --- a/packfile.h +++ b/packfile.h @@ -153,16 +153,6 @@ enum kept_pack_type { KEPT_PACK_IN_CORE_OPEN = (1 << 2), }; -/* - * Count the number objects contained in the given packfile store. If - * successful, the number of objects will be written to the `out` pointer. - * - * Return 0 on success, a negative error code otherwise. - */ -int packfile_store_count_objects(struct odb_source_packed *store, - enum odb_count_objects_flags flags, - unsigned long *out); - /* * Retrieve the cache of kept packs from the given packfile store. Accepts a * combination of `kept_pack_type` flags. The cache is computed on demand and
-- 2.54.0.1064.gd145956f57.dirty