Skip to content

Commit 2a7d63a

Browse files
committed
Merge branch 'ds/bitmap-lookup-remove-tracing'
Perf-fix. * ds/bitmap-lookup-remove-tracing: pack-bitmap: remove trace2 region from hot path
2 parents 4fd6c5e + 89a1ab8 commit 2a7d63a

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

pack-bitmap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,10 +830,9 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
830830
if (!bitmap_git->table_lookup)
831831
return NULL;
832832

833-
trace2_region_enter("pack-bitmap", "reading_lookup_table", the_repository);
833+
/* this is a fairly hot codepath - no trace2_region please */
834834
/* NEEDSWORK: cache misses aren't recorded */
835835
bitmap = lazy_bitmap_for_commit(bitmap_git, commit);
836-
trace2_region_leave("pack-bitmap", "reading_lookup_table", the_repository);
837836
if (!bitmap)
838837
return NULL;
839838
return lookup_stored_bitmap(bitmap);

t/t5310-pack-bitmaps.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -455,13 +455,6 @@ test_expect_success 'verify writing bitmap lookup table when enabled' '
455455
grep "\"label\":\"writing_lookup_table\"" trace2
456456
'
457457

458-
test_expect_success 'lookup table is actually used to traverse objects' '
459-
git repack -adb &&
460-
GIT_TRACE2_EVENT="$(pwd)/trace3" \
461-
git rev-list --use-bitmap-index --count --all &&
462-
grep "\"label\":\"reading_lookup_table\"" trace3
463-
'
464-
465458
test_expect_success 'truncated bitmap fails gracefully (lookup table)' '
466459
test_config pack.writebitmaphashcache false &&
467460
git repack -adb &&

0 commit comments

Comments
 (0)