From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
The chunk-format API allows automatically writing the table of contents
for a chunk-based file format when using an array of "struct
chunk_info"s. Update write_midx_internal() to use this strategy, which
also simplifies the chunk writing loop. This loop will be replaced with
a chunk-format API call in an upcoming change.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
midx.c | 96 +++++++++++++---------------------------------------------
1 file changed, 21 insertions(+), 75 deletions(-)
diff --git a/midx.c b/midx.c
index ce6d4339bd..0548266bea 100644
--- a/midx.c
+++ b/midx.c
@@ -11,6 +11,7 @@
#include "trace2.h"
#include "run-command.h"
#include "repository.h"
+#include "chunk-format.h"
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1
@@ -799,15 +800,14 @@ static int write_midx_large_offsets(struct hashfile *f,
static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
struct string_list *packs_to_drop, unsigned flags)
{
- unsigned char cur_chunk, num_chunks = 0;
+ unsigned char num_chunks = 0;
char *midx_name;
uint32_t i;
struct hashfile *f = NULL;
struct lock_file lk;
struct write_midx_context ctx = { 0 };
uint64_t header_size = 0;
- uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
- uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
+ struct chunk_info chunks[MIDX_MAX_CHUNKS];
int pack_name_concat_len = 0;
int dropped_packs = 0;
int result = 0;
@@ -923,7 +923,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
if (ctx.m)
close_midx(ctx.m);
- cur_chunk = 0;
num_chunks = ctx.large_offsets_needed ? 5 : 4;
if (ctx.nr - dropped_packs == 0) {
@@ -934,85 +933,32 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
header_size = write_midx_header(f, num_chunks, ctx.nr - dropped_packs);
- chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
- chunk_offsets[cur_chunk] = header_size + (num_chunks + 1) * MIDX_CHUNKLOOKUP_WIDTH;
+ chunks[0].id = MIDX_CHUNKID_PACKNAMES;
+ chunks[0].size = pack_name_concat_len;
+ chunks[0].write_fn = write_midx_pack_names;
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDFANOUT;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + pack_name_concat_len;
+ chunks[1].id = MIDX_CHUNKID_OIDFANOUT;
+ chunks[1].size = MIDX_CHUNK_FANOUT_SIZE;
+ chunks[1].write_fn = write_midx_oid_fanout;
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDLOOKUP;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + MIDX_CHUNK_FANOUT_SIZE;
+ chunks[2].id = MIDX_CHUNKID_OIDLOOKUP;
+ chunks[2].size = ctx.entries_nr * the_hash_algo->rawsz;
+ chunks[2].write_fn = write_midx_oid_lookup;
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + ctx.entries_nr * the_hash_algo->rawsz;
+ chunks[3].id = MIDX_CHUNKID_OBJECTOFFSETS;
+ chunks[3].size = ctx.entries_nr * MIDX_CHUNK_OFFSET_WIDTH;
+ chunks[3].write_fn = write_midx_object_offsets;
- cur_chunk++;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + ctx.entries_nr * MIDX_CHUNK_OFFSET_WIDTH;
if (ctx.large_offsets_needed) {
- chunk_ids[cur_chunk] = MIDX_CHUNKID_LARGEOFFSETS;
-
- cur_chunk++;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] +
- ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
+ chunks[4].id = MIDX_CHUNKID_LARGEOFFSETS;
+ chunks[4].size = ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
+ chunks[4].write_fn = write_midx_large_offsets;
}
- chunk_ids[cur_chunk] = 0;
-
- for (i = 0; i <= num_chunks; i++) {
- if (i && chunk_offsets[i] < chunk_offsets[i - 1])
- BUG("incorrect chunk offsets: %"PRIu64" before %"PRIu64,
- chunk_offsets[i - 1],
- chunk_offsets[i]);
-
- if (chunk_offsets[i] % MIDX_CHUNK_ALIGNMENT)
- BUG("chunk offset %"PRIu64" is not properly aligned",
- chunk_offsets[i]);
-
- hashwrite_be32(f, chunk_ids[i]);
- hashwrite_be64(f, chunk_offsets[i]);
- }
-
- for (i = 0; i < num_chunks; i++) {
- if (f->total + f->offset != chunk_offsets[i])
- BUG("incorrect chunk offset (%"PRIu64" != %"PRIu64") for chunk id %"PRIx32,
- chunk_offsets[i],
- f->total + f->offset,
- chunk_ids[i]);
-
- switch (chunk_ids[i]) {
- case MIDX_CHUNKID_PACKNAMES:
- write_midx_pack_names(f, &ctx);
- break;
-
- case MIDX_CHUNKID_OIDFANOUT:
- write_midx_oid_fanout(f, &ctx);
- break;
-
- case MIDX_CHUNKID_OIDLOOKUP:
- write_midx_oid_lookup(f, &ctx);
- break;
-
- case MIDX_CHUNKID_OBJECTOFFSETS:
- write_midx_object_offsets(f, &ctx);
- break;
-
- case MIDX_CHUNKID_LARGEOFFSETS:
- write_midx_large_offsets(f, &ctx);
- break;
-
- default:
- BUG("trying to write unknown chunk id %"PRIx32,
- chunk_ids[i]);
- }
- }
+ write_table_of_contents(f, header_size, chunks, num_chunks);
- if (f->total + f->offset != chunk_offsets[num_chunks])
- BUG("incorrect final offset %"PRIu64" != %"PRIu64,
- f->total + f->offset,
- chunk_offsets[num_chunks]);
+ for (i = 0; i < num_chunks; i++)
+ chunks[i].write_fn(f, &ctx);
finalize_hashfile(f, NULL, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
commit_lock_file(&lk);
--
gitgitgadget
