diff options
| author | Christian Couder <christian.couder@gmail.com> | 2018-08-16 06:13:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-16 17:56:44 (GMT) |
| commit | fe0ac2fb7f8e87d37ef83dcee2d93901d58d8277 (patch) | |
| tree | 37f990bd4446b96bdb41d09a618576ae89a20b30 /pack-objects.c | |
| parent | 108f530385e969feab343b2b8acadeb7bb670009 (diff) | |
| download | git-fe0ac2fb7f8e87d37ef83dcee2d93901d58d8277.zip git-fe0ac2fb7f8e87d37ef83dcee2d93901d58d8277.tar.gz git-fe0ac2fb7f8e87d37ef83dcee2d93901d58d8277.tar.bz2 | |
pack-objects: move 'layer' into 'struct packing_data'
This reduces the size of 'struct object_entry' from 88 bytes
to 80 and therefore makes packing objects more efficient.
For example on a Linux repo with 12M objects,
`git pack-objects --all` needs extra 96MB memory even if the
layer feature is not used.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pack-objects.c b/pack-objects.c index 3031457..9838946 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -163,6 +163,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, if (pdata->tree_depth) REALLOC_ARRAY(pdata->tree_depth, pdata->nr_alloc); + + if (pdata->layer) + REALLOC_ARRAY(pdata->layer, pdata->nr_alloc); } new_entry = pdata->objects + pdata->nr_objects++; @@ -181,5 +184,8 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, if (pdata->tree_depth) pdata->tree_depth[pdata->nr_objects - 1] = 0; + if (pdata->layer) + pdata->layer[pdata->nr_objects - 1] = 0; + return new_entry; } |