Re: [PATCH v2] pack-objects: trace pack bytes written

On Thu, Aug 20, 2026 at 07:41:33AM +0200, Patrick Steinhardt wrote:

On Wed, Aug 19, 2026 at 04:28:10PM -0700, friel@openai.com wrote:

quoted

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 1ec5b6f206..252530172c 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c

@@ -1389,6 +1390,8 @@ static void write_pack_file(void)
 			display_progress(progress_state, written);
 		}
 
+		bytes_written += hashfile_total(f) +
+			the_repository->hash_algo->rawsz;
 		if (pack_to_stdout) {
 			/*
 			 * We never fsync when writing to stdout since we may

I guess the addition here accounts for the trailing hash written by the
hashfile. If so, shouldn't we also use the algortihm that the hashfile
uses in the first place via `f->algop->rawsz`?

Perhaps, though that is used to write the hash (via CSUM_HASH_IN_STREAM)
only in two of the conditional blocks. In the third we finalize the
hashfile and then use fixup_pack_header_footer(), passing the_hash_algo
directly (not even the_repository->hash_algo, though of course they mean
the same thing).

It all works out, of course, because we created the hashfile struct
earlier using the_repository->hash_algo. So I think this is mostly
academic in the first place, but your suggestion harmonizes two of the
conditional blocks while creating disagreement with the third.

I think something like this would "fix" it by consistently using the
hashfile's algo in all three blocks:

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 4a5fcbe5f5..0fdff72f41 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c

@@ -1413,9 +1413,9 @@ static void write_pack_file(void)
 			 * If we wrote the wrong number of entries in the
 			 * header, rewrite it like in fast-import.
 			 */
-
+			const struct git_hash_algo *algo = f->algop;
 			int fd = finalize_hashfile(f, hash, FSYNC_COMPONENT_PACK, 0);
-			fixup_pack_header_footer(the_hash_algo, fd, hash,
+			fixup_pack_header_footer(algo, fd, hash,
 						 pack_tmp_name, nr_written,
 						 hash, offset);
 			close(fd);

But there's a subtle yet interesting difference here! f->algop won't
necessarily be the same pointer as the_hash_algo. If we compiled with an
unsafe variant, that will be used for hashfiles. If we're just looking
at rawsz that's OK; the two variants should be identical (other than
performance and collision detection), so taking rawsz from either is
fine.

But fixup_pack_header_footer() actually recomputes the hash (as it must
if we tweak the header). Right now it does it using the "normal"
variant, but we should be able to use the unsafe one (which my diff
snippet above would start to do).

Of course this whole thing is absurdly pessimal in the first place. If
we are just going to throw out the hashfile's checksum, then why bother
computing it in the first place? Because we don't trust a disk write at
all, and actually verify the original hash computation as we read the
bytes back in! So we'll actually sha1 the written packfile three times.
Yikes. I wonder if it's really worth being so paranoid. But that is how
it has always been.

Anyway, that is a bit of a tangent from the patch in question. I think
either spelling is OK for the purposes of this patch. If somebody wants
to pursue harmonizing the paths (and maybe even doing some timings to
see if switching to the unsafe variant is noticeable here, and what the
total cost of this triple-write approach is), that can happen
separately.

-Peff