pack-bitmap: extra trace2 information

Add some extra trace2 lines to capture the number of bitmap lookups that
are hits versus misses, as well as the number of reachability roots that
have bitmap coverage (versus those that do not).

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap.c b/pack-bitmap.c
index e61058dada68e5ce6d4eb6ff3347ddc4d343ee30..1966b3b95f11f38e6353aad706306a6367e5d05d 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -116,6 +116,10 @@ struct bitmap_index {
 
 static int pseudo_merges_satisfied_nr;
 static int pseudo_merges_cascades_nr;
+static int existing_bitmaps_hits_nr;
+static int existing_bitmaps_misses_nr;
+static int roots_with_bitmaps_nr;
+static int roots_without_bitmaps_nr;
 
 static struct ewah_bitmap *lookup_stored_bitmap(struct stored_bitmap *st)
 {
@@ -1040,10 +1044,14 @@ static int add_to_include_set(struct bitmap_index *bitmap_git,
 
        partial = bitmap_for_commit(bitmap_git, commit);
        if (partial) {
+               existing_bitmaps_hits_nr++;
+
                bitmap_or_ewah(data->base, partial);
                return 0;
        }
 
+       existing_bitmaps_misses_nr++;
+
        bitmap_set(data->base, bitmap_pos);
        if (apply_pseudo_merges_for_commit_1(bitmap_git, data->base, commit,
                                             bitmap_pos))
@@ -1099,8 +1107,12 @@ static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
 {
        struct ewah_bitmap *or_with = bitmap_for_commit(bitmap_git, commit);
 
-       if (!or_with)
+       if (!or_with) {
+               existing_bitmaps_misses_nr++;
                return 0;
+       }
+
+       existing_bitmaps_hits_nr++;
 
        if (!*base)
                *base = ewah_to_bitmap(or_with);
@@ -1407,8 +1419,12 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
                        object->flags &= ~UNINTERESTING;
                        add_pending_object(revs, object, "");
                        needs_walk = 1;
+
+                       roots_without_bitmaps_nr++;
                } else {
                        object->flags |= SEEN;
+
+                       roots_with_bitmaps_nr++;
                }
        }
 
@@ -1975,6 +1991,14 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
                           pseudo_merges_satisfied_nr);
        trace2_data_intmax("bitmap", the_repository, "pseudo_merges_cascades",
                           pseudo_merges_cascades_nr);
+       trace2_data_intmax("bitmap", the_repository, "bitmap/hits",
+                          existing_bitmaps_hits_nr);
+       trace2_data_intmax("bitmap", the_repository, "bitmap/misses",
+                          existing_bitmaps_misses_nr);
+       trace2_data_intmax("bitmap", the_repository, "bitmap/roots_with_bitmap",
+                          roots_with_bitmaps_nr);
+       trace2_data_intmax("bitmap", the_repository, "bitmap/roots_without_bitmap",
+                          roots_without_bitmaps_nr);
 
        return bitmap_git;