commit-graph: simplify write_commit_graph_file() #2
Unify the 'chunk_ids' and 'chunk_sizes' arrays into an array of 'struct chunk_info'. This will allow more cleanups in the following patches. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Jun 5, 2020 at 13:00 UTC
7fbfe07ab4d4e58c0971dac73001b89f180a0af3
1 file changed
+24
-21
commit-graph.c
+24
-21
@@ -1522,14 +1522,18 @@ static int write_graph_chunk_base(struct hashfile *f,
1522
return 0;
1523
}
1524
1525
+struct chunk_info {
1526
+ uint32_t id;
1527
+ uint64_t size;
1528
+};
1529
+
1530
static int write_commit_graph_file(struct write_commit_graph_context *ctx)
1531
{
1532
uint32_t i;
1533
int fd;
1534
struct hashfile *f;
1535
struct lock_file lk = LOCK_INIT;
1531
- uint32_t chunk_ids[MAX_NUM_CHUNKS + 1];
1532
- uint64_t chunk_sizes[MAX_NUM_CHUNKS + 1];
1536
+ struct chunk_info chunks[MAX_NUM_CHUNKS + 1];
1537
const unsigned hashsz = the_hash_algo->rawsz;
1538
struct strbuf progress_title = STRBUF_INIT;
1539
int num_chunks = 3;
@@ -1573,35 +1577,34 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
1577
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
1578
}
1579
1576
- chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
1577
- chunk_sizes[0] = GRAPH_FANOUT_SIZE;
1578
- chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
1579
- chunk_sizes[1] = hashsz * ctx->commits.nr;
1580
- chunk_ids[2] = GRAPH_CHUNKID_DATA;
1581
- chunk_sizes[2] = (hashsz + 16) * ctx->commits.nr;
1582
-
1580
+ chunks[0].id = GRAPH_CHUNKID_OIDFANOUT;
1581
+ chunks[0].size = GRAPH_FANOUT_SIZE;
1582
+ chunks[1].id = GRAPH_CHUNKID_OIDLOOKUP;
1583
+ chunks[1].size = hashsz * ctx->commits.nr;
1584
+ chunks[2].id = GRAPH_CHUNKID_DATA;
1585
+ chunks[2].size = (hashsz + 16) * ctx->commits.nr;
1586
if (ctx->num_extra_edges) {
1584
- chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
1585
- chunk_sizes[num_chunks] = 4 * ctx->num_extra_edges;
1587
+ chunks[num_chunks].id = GRAPH_CHUNKID_EXTRAEDGES;
1588
+ chunks[num_chunks].size = 4 * ctx->num_extra_edges;
1589
num_chunks++;
1590
}
1591
if (ctx->changed_paths) {
1589
- chunk_ids[num_chunks] = GRAPH_CHUNKID_BLOOMINDEXES;
1590
- chunk_sizes[num_chunks] = sizeof(uint32_t) * ctx->commits.nr;
1592
+ chunks[num_chunks].id = GRAPH_CHUNKID_BLOOMINDEXES;
1593
+ chunks[num_chunks].size = sizeof(uint32_t) * ctx->commits.nr;
1594
num_chunks++;
1592
- chunk_ids[num_chunks] = GRAPH_CHUNKID_BLOOMDATA;
1593
- chunk_sizes[num_chunks] = sizeof(uint32_t) * 3
1595
+ chunks[num_chunks].id = GRAPH_CHUNKID_BLOOMDATA;
1596
+ chunks[num_chunks].size = sizeof(uint32_t) * 3
1597
+ ctx->total_bloom_filter_data_size;
1598
num_chunks++;
1599
}
1600
if (ctx->num_commit_graphs_after > 1) {
1598
- chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
1599
- chunk_sizes[num_chunks] = hashsz * (ctx->num_commit_graphs_after - 1);
1601
+ chunks[num_chunks].id = GRAPH_CHUNKID_BASE;
1602
+ chunks[num_chunks].size = hashsz * (ctx->num_commit_graphs_after - 1);
1603
num_chunks++;
1604
}
1605
1603
- chunk_ids[num_chunks] = 0;
1604
- chunk_sizes[num_chunks] = 0;
1606
+ chunks[num_chunks].id = 0;
1607
+ chunks[num_chunks].size = 0;
1608
1609
hashwrite_be32(f, GRAPH_SIGNATURE);
1610
@@ -1614,12 +1617,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
1617
for (i = 0; i <= num_chunks; i++) {
1618
uint32_t chunk_write[3];
1619
1617
- chunk_write[0] = htonl(chunk_ids[i]);
1620
+ chunk_write[0] = htonl(chunks[i].id);
1621
chunk_write[1] = htonl(chunk_offset >> 32);
1622
chunk_write[2] = htonl(chunk_offset & 0xffffffff);
1623
hashwrite(f, chunk_write, 12);
1624
1622
- chunk_offset += chunk_sizes[i];
1625
+ chunk_offset += chunks[i].size;
1626
}
1627
1628
if (ctx->report_progress) {