Skip to content

Commit

Permalink
index-pack: show histogram when emulating "verify-pack -v"
Browse files Browse the repository at this point in the history
The histogram produced by "verify-pack -v" always had an artificial
limit of 50, but index-pack knows what the maximum delta depth is, so
we do not have to limit it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jun 6, 2011
1 parent 38a4556 commit d1a0ed1
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions builtin/index-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ static struct progress *progress;
static unsigned char input_buffer[4096];
static unsigned int input_offset, input_len;
static off_t consumed_bytes;
static unsigned deepest_delta;
static git_SHA_CTX input_ctx;
static uint32_t input_crc32;
static int input_fd, output_fd, pack_fd;
Expand Down Expand Up @@ -538,6 +539,8 @@ static void resolve_delta(struct object_entry *delta_obj,

delta_obj->real_type = base->obj->real_type;
delta_obj->delta_depth = base->obj->delta_depth + 1;
if (deepest_delta < delta_obj->delta_depth)
deepest_delta = delta_obj->delta_depth;
delta_obj->base_object_no = base->obj - objects;
delta_data = get_data_from_pack(delta_obj);
base_data = get_base_data(base);
Expand Down Expand Up @@ -973,12 +976,17 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)

static void show_pack_info(int stat_only)
{
int i;
int i, baseobjects = nr_objects - nr_deltas;
unsigned long *chain_histogram = NULL;

if (deepest_delta)
chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));

for (i = 0; i < nr_objects; i++) {
struct object_entry *obj = &objects[i];

/* NEEDSWORK: Compute data necessary for the "histogram" here */

if (is_delta_type(obj->type))
chain_histogram[obj->delta_depth - 1]++;
if (stat_only)
continue;
printf("%s %-6s %lu %lu %"PRIuMAX,
Expand All @@ -992,6 +1000,18 @@ static void show_pack_info(int stat_only)
}
putchar('\n');
}

if (baseobjects)
printf("non delta: %d object%s\n",
baseobjects, baseobjects > 1 ? "s" : "");
for (i = 0; i < deepest_delta; i++) {
if (!chain_histogram[i])
continue;
printf("chain length = %d: %lu object%s\n",
i + 1,
chain_histogram[i],
chain_histogram[i] > 1 ? "s" : "");
}
}

int cmd_index_pack(int argc, const char **argv, const char *prefix)
Expand Down

0 comments on commit d1a0ed1

Please sign in to comment.