reduce git-pack-objects memory usage a little more
The delta depth doesn't have to be stored in the global object array structure since it is only used during the deltification pass. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Jul 12, 2007 at 17:07 UTC
5a235b5ed02fa0f9f67c4fbec703e3126eb3c7f5
1 file changed
+9
-10
builtin-pack-objects.c
+9
-10
@@ -26,9 +26,6 @@ git-pack-objects [{ -q | --progress | --all-progress }] \n\
26
struct object_entry {
27
struct pack_idx_entry idx;
28
unsigned long size; /* uncompressed size */
29
-
30
- unsigned int hash; /* name hint hash */
31
- unsigned int depth; /* delta depth */
29
struct packed_git *in_pack; /* already in pack */
30
off_t in_pack_offset;
31
struct object_entry *delta; /* delta base object */
@@ -38,6 +35,7 @@ struct object_entry {
35
*/
36
void *delta_data; /* cached delta (uncompressed) */
37
unsigned long delta_size; /* delta data size (uncompressed) */
38
+ unsigned int hash; /* name hint hash */
39
enum object_type type;
40
enum object_type in_pack_type; /* could be delta */
41
unsigned char in_pack_header_size;
@@ -1274,6 +1272,7 @@ struct unpacked {
1272
struct object_entry *entry;
1273
void *data;
1274
struct delta_index *index;
1275
+ unsigned depth;
1276
};
1277
1278
static int delta_cacheable(struct unpacked *trg, struct unpacked *src,
@@ -1332,7 +1331,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1331
return 0;
1332
1333
/* Let's not bust the allowed depth. */
1335
- if (src_entry->depth >= max_depth)
1334
+ if (src->depth >= max_depth)
1335
return 0;
1336
1337
/* Now some size filtering heuristics. */
@@ -1342,9 +1341,9 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1341
ref_depth = 1;
1342
} else {
1343
max_size = trg_entry->delta_size;
1345
- ref_depth = trg_entry->depth;
1344
+ ref_depth = trg->depth;
1345
}
1347
- max_size = max_size * (max_depth - src_entry->depth) /
1346
+ max_size = max_size * (max_depth - src->depth) /
1347
(max_depth - ref_depth + 1);
1348
if (max_size == 0)
1349
return 0;
@@ -1388,17 +1387,17 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1387
if (trg_entry->delta_data) {
1388
/* Prefer only shallower same-sized deltas. */
1389
if (delta_size == trg_entry->delta_size &&
1391
- src_entry->depth + 1 >= trg_entry->depth) {
1390
+ src->depth + 1 >= trg->depth) {
1391
free(delta_buf);
1392
return 0;
1393
}
1394
delta_cache_size -= trg_entry->delta_size;
1395
free(trg_entry->delta_data);
1396
+ trg_entry->delta_data = NULL;
1397
}
1398
- trg_entry->delta_data = 0;
1398
trg_entry->delta = src_entry;
1399
trg_entry->delta_size = delta_size;
1401
- trg_entry->depth = src_entry->depth + 1;
1400
+ trg->depth = src->depth + 1;
1401
1402
if (delta_cacheable(src, trg, src_size, trg_size, delta_size)) {
1403
trg_entry->delta_data = xrealloc(delta_buf, delta_size);
@@ -1511,7 +1510,7 @@ static void find_deltas(struct object_entry **list, int window, int depth)
1510
* depth, leaving it in the window is pointless. we
1511
* should evict it first.
1512
*/
1514
- if (entry->delta && depth <= entry->depth)
1513
+ if (entry->delta && depth <= n->depth)
1514
continue;
1515
1516
next: