pack-bitmap.c: avoid repeated `pack_pos_to_offset()` during reuse

When calling `try_partial_reuse()`, the (sole) caller from the function `reuse_partial_packfile_from_bitmap_1()` has to translate its bit position to a pack position. In the MIDX bitmap case, the caller translates from the bit position, to a position in the MIDX's pseudo-pack order (with `pack_pos_to_midx()`), then get a pack offset (with `nth_midxed_offset()`) before finally working backwards to get the pack position in the source pack by calling `offset_to_pack_pos()`. In the non-MIDX bitmap case, we can use the bit position as the pack position directly (see the comment at the beginning of the `reuse_partial_packfile_from_bitmap_1()` function for why). In either case, the first thing that `try_partial_reuse()` does after being called is determine the offset of the object at the given pack position by calling `pack_pos_to_offset()`. But we already have that information in the MIDX case! Avoid re-computing that information by instead passing it in. In the MIDX case, we already have that information stored. In the non-MIDX case, the call to `pack_pos_to_offset()` moves from the function `try_partial_reuse()` to its caller. In total, we'll save one call to `pack_pos_to_offset()` when processing MIDX bitmaps. (On my machine, there is a slight speed-up on the order of ~2ms, but it is within the margin of error over 10 runs, so I think you'd have to have a truly gigantic repository to confidently measure any significant improvement here). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Aug 27, 2024 at 17:13 UTC db40e3c92b9ccd03d2263b12cf1824ffab8a1cce
1 file changed +7 -4
pack-bitmap.c
+7 -4
@@ -2055,17 +2055,18 @@ static int try_partial_reuse(struct bitmap_index *bitmap_git,
2055 struct bitmapped_pack *pack,
2056 size_t bitmap_pos,
2057 uint32_t pack_pos,
2058 + off_t offset,
2059 struct bitmap *reuse,
2060 struct pack_window **w_curs)
2061 {
2061 - off_t offset, delta_obj_offset;
2062 + off_t delta_obj_offset;
2063 enum object_type type;
2064 unsigned long size;
2065
2066 if (pack_pos >= pack->p->num_objects)
2067 return -1; /* not actually in the pack */
2068
2068 - offset = delta_obj_offset = pack_pos_to_offset(pack->p, pack_pos);
2069 + delta_obj_offset = offset;
2070 type = unpack_object_header(pack->p, w_curs, &offset, &size);
2071 if (type < 0)
2072 return -1; /* broken packfile, punt */
@@ -2184,6 +2185,7 @@ static void reuse_partial_packfile_from_bitmap_1(struct bitmap_index *bitmap_git
2185 for (offset = 0; offset < BITS_IN_EWORD; offset++) {
2186 size_t bit_pos;
2187 uint32_t pack_pos;
2188 + off_t ofs;
2189
2190 if (word >> offset == 0)
2191 break;
@@ -2198,7 +2200,6 @@ static void reuse_partial_packfile_from_bitmap_1(struct bitmap_index *bitmap_git
2200
2201 if (bitmap_is_midx(bitmap_git)) {
2202 uint32_t midx_pos;
2201 - off_t ofs;
2203
2204 midx_pos = pack_pos_to_midx(bitmap_git->midx, bit_pos);
2205 ofs = nth_midxed_offset(bitmap_git->midx, midx_pos);
@@ -2213,10 +2214,12 @@ static void reuse_partial_packfile_from_bitmap_1(struct bitmap_index *bitmap_git
2214 BUG("advanced beyond the end of pack %s (%"PRIuMAX" > %"PRIu32")",
2215 pack_basename(pack->p), (uintmax_t)pack_pos,
2216 pack->p->num_objects);
2217 +
2218 + ofs = pack_pos_to_offset(pack->p, pack_pos);
2219 }
2220
2221 if (try_partial_reuse(bitmap_git, pack, bit_pos,
2219 - pack_pos, reuse, &w_curs) < 0) {
2222 + pack_pos, ofs, reuse, &w_curs) < 0) {
2223 /*
2224 * try_partial_reuse indicated we couldn't reuse
2225 * any bits, so there is no point in trying more