[PATCH 1/6] builtin/fast-import: stop reporting packfile statistics
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 20, 2026, 12:02 UTC
- Message-ID
- <20261120-pks-packfile-global-statistics-v1-1-19beb83b145f@pks.im>
- In-Reply-To
- <20261120-pks-packfile-global-statistics-v1-0-19beb83b145f@pks.im>
By default, git-fast-import(1) prints a bunch of statistics about all kinds of internal details of Git. This includes for example how many objects have been allocated, the number of refs processed, or the amount of memory that was allocated.
Reporting this kind information is highly questionable, doubly so as it is done by default, as a user really shoudln't have to worry about such internal implementation details. For some of the above metrics it could be argued though that it's indeed interesting to learn about the number of objects processed to get a rough sense of what git-fast-import(1) has done. But for other kind of information that's not the case, as it is without a doubt purely internal implementation details.
One of these reported implementation details is our packfile statistics. These include information on the system's page size, the number of packs that were opened, the number of calls to mmap(3) and how many pack windows were created. Reporting that kind of information, and that even by default, is just completely uncalled for. This information may be useful to a developer, but a user really shouldn't have to care about any of this.
More importantly though, with pluggable object databases we shouldn't assume that we're using packfiles in the first place anymore. The current implementation of git-fast-import(1) still does, but we will convert it to use transactions sooner rather than later.
Let's just unceremoniously drop reporting packfile information to the user. If anyone complains (which I highly doubt), then we may consider reintroducing this as trace2 data. The same is arguably true for many of the other reported statistics. But for now I care about the packfile subsystem, only, and hence those are left as-is.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- Documentation/git-fast-import.adoc | 5 ++--- builtin/fast-import.c | 4 +--- packfile.c | 36 ------------------------------------ packfile.h | 2 -- 4 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/Documentation/git-fast-import.adoc b/Documentation/git-fast-import.adoc index 5201e493345..6afe14b650c 100644 --- a/Documentation/git-fast-import.adoc +++ b/Documentation/git-fast-import.adoc @@ -48,9 +48,8 @@ OPTIONS --stats:: Display some basic statistics about the objects fast-import has - created, the packfiles they were stored into, and the - memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with --quiet. + created, and the memory used by fast-import during this run. Showing + this output is currently the default, but can be disabled with --quiet. --allow-unsafe-features:: Many command-line options can be provided as part of the diff --git a/builtin/fast-import.c b/builtin/fast-import.c index ab5d2a23448..14e75149415 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -4153,7 +4153,7 @@ static int option_parse_early_allow_unsafe(const struct option *option, int cmd_fast_import(int argc, const char **argv, const char *prefix, - struct repository *repo) + struct repository *repo UNUSED) { struct fast_import_state state; @@ -4346,8 +4346,6 @@ int cmd_fast_import(int argc, fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd + fi_mem_pool.pool_alloc) /1024)); fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024); fprintf(stderr, "---------------------------------------------------------------------\n"); - pack_report(repo); - fprintf(stderr, "---------------------------------------------------------------------\n"); fprintf(stderr, "\n"); } diff --git a/packfile.c b/packfile.c index b32b4cd75da..5aa9b009174 100644 --- a/packfile.c +++ b/packfile.c @@ -36,38 +36,10 @@ char *odb_pack_name(struct repository *r, struct strbuf *buf, } static unsigned int pack_used_ctr; -static unsigned int pack_mmap_calls; -static unsigned int peak_pack_open_windows; -static unsigned int pack_open_windows; static unsigned int pack_open_fds; static unsigned int pack_max_fds; -static size_t peak_pack_mapped; static size_t pack_mapped; -#define SZ_FMT PRIuMAX -static inline uintmax_t sz_fmt(size_t s) { return s; } - -void pack_report(struct repository *repo) -{ - fprintf(stderr, - "pack_report: getpagesize() = %10" SZ_FMT "\n" - "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n" - "pack_report: core.packedGitLimit = %10" SZ_FMT "\n", - sz_fmt(getpagesize()), - sz_fmt(repo->settings.packed_git_window_size), - sz_fmt(repo->settings.packed_git_limit)); - fprintf(stderr, - "pack_report: pack_used_ctr = %10u\n" - "pack_report: pack_mmap_calls = %10u\n" - "pack_report: pack_open_windows = %10u / %10u\n" - "pack_report: pack_mapped = " - "%10" SZ_FMT " / %10" SZ_FMT "\n", - pack_used_ctr, - pack_mmap_calls, - pack_open_windows, peak_pack_open_windows, - sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped)); -} - /* * Open and mmap the index file at path, perform a couple of * consistency checks, then record its information to p. Return 0 on @@ -291,7 +263,6 @@ static int unuse_one_window(struct object_database *odb) else lru_p->windows = lru_w->next; free(lru_w); - pack_open_windows--; return 1; } return 0; @@ -307,7 +278,6 @@ void close_pack_windows(struct packed_git *p) p->pack_name); munmap(w->base, w->len); pack_mapped -= w->len; - pack_open_windows--; p->windows = w->next; free(w); } @@ -665,12 +635,6 @@ unsigned char *use_pack(struct packed_git *p, if (!win->offset && win->len == p->pack_size && !p->do_not_close) close_pack_fd(p); - pack_mmap_calls++; - pack_open_windows++; - if (pack_mapped > peak_pack_mapped) - peak_pack_mapped = pack_mapped; - if (pack_open_windows > peak_pack_open_windows) - peak_pack_open_windows = pack_open_windows; win->next = p->windows; p->windows = win; } diff --git a/packfile.h b/packfile.h index ed3378c4576..bab9931d00e 100644 --- a/packfile.h +++ b/packfile.h @@ -217,8 +217,6 @@ int for_each_object_in_pack(struct packed_git *p, #define PACKDIR_FILE_GARBAGE 4 extern void (*report_garbage)(unsigned seen_bits, const char *path); -void pack_report(struct repository *repo); - /* * mmap the index file for the specified packfile (if it is not * already mmapped). Return 0 on success.
-- 2.56.1.831.g720f3f5937.dirty