midx: drop chunk progress during write
Most expensive operations in write_midx_internal() use the context struct's progress member, and these indicate the process of the expensive operations within the chunk writing methods. However, there is a competing progress struct that counts the progress over all chunks. This is not very helpful compared to the others, so drop it. This also reduces our barriers to combining the chunk writing code with chunk-format.c. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Feb 18, 2021 at 14:07 UTC
c1442410d869cd5fb2c0dd79aa1a7c152b99b0f9
1 file changed
-7
midx.c
-7
@@ -808,7 +808,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
808
uint64_t header_size = 0;
809
uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
810
uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
811
- struct progress *progress = NULL;
811
int pack_name_concat_len = 0;
812
int dropped_packs = 0;
813
int result = 0;
@@ -976,9 +975,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
975
hashwrite_be64(f, chunk_offsets[i]);
976
}
977
979
- if (flags & MIDX_PROGRESS)
980
- progress = start_delayed_progress(_("Writing chunks to multi-pack-index"),
981
- num_chunks);
978
for (i = 0; i < num_chunks; i++) {
979
if (f->total + f->offset != chunk_offsets[i])
980
BUG("incorrect chunk offset (%"PRIu64" != %"PRIu64") for chunk id %"PRIx32,
@@ -1011,10 +1007,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
1007
BUG("trying to write unknown chunk id %"PRIx32,
1008
chunk_ids[i]);
1009
}
1014
-
1015
- display_progress(progress, i + 1);
1010
}
1017
- stop_progress(&progress);
1011
1012
if (hashfile_total(f) != chunk_offsets[num_chunks])
1013
BUG("incorrect final offset %"PRIu64" != %"PRIu64,