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.h | |
| 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.h')
| -rw-r--r-- | pack-objects.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pack-objects.h b/pack-objects.h index 3cb5527..ad3c208 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -101,8 +101,6 @@ struct object_entry { unsigned no_try_delta:1; unsigned in_pack_type:TYPE_BITS; /* could be delta */ - unsigned char layer; - unsigned preferred_base:1; /* * we do not pack this, but is available * to be used as the base object to delta @@ -147,6 +145,7 @@ struct packing_data { /* delta islands */ unsigned int *tree_depth; + unsigned char *layer; }; void prepare_packing_data(struct packing_data *pdata); @@ -369,4 +368,21 @@ static inline void oe_set_tree_depth(struct packing_data *pack, pack->tree_depth[e - pack->objects] = tree_depth; } +static inline unsigned char oe_layer(struct packing_data *pack, + struct object_entry *e) +{ + if (!pack->layer) + return 0; + return pack->layer[e - pack->objects]; +} + +static inline void oe_set_layer(struct packing_data *pack, + struct object_entry *e, + unsigned char layer) +{ + if (!pack->layer) + ALLOC_ARRAY(pack->layer, pack->nr_objects); + pack->layer[e - pack->objects] = layer; +} + #endif |