delta-islands: free island_marks and bitmaps
On my mirror of linux.git forkgroup with 780 islands, this saves nearly 4G of heap memory in pack-objects. This savings only benefits delta island users of pack bitmaps, as the process would otherwise be exiting anyways. However, there's probably not many delta island users, but the majority of delta island users would also be pack bitmaps users. Signed-off-by: Eric Wong <e@80x24.org> Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
844ede312b
commit
647982bb71
@ -929,8 +929,10 @@ static struct object_entry **compute_write_order(void)
|
|||||||
*/
|
*/
|
||||||
for_each_tag_ref(mark_tagged, NULL);
|
for_each_tag_ref(mark_tagged, NULL);
|
||||||
|
|
||||||
if (use_delta_islands)
|
if (use_delta_islands) {
|
||||||
max_layers = compute_pack_layers(&to_pack);
|
max_layers = compute_pack_layers(&to_pack);
|
||||||
|
free_island_marks();
|
||||||
|
}
|
||||||
|
|
||||||
ALLOC_ARRAY(wo, to_pack.nr_objects);
|
ALLOC_ARRAY(wo, to_pack.nr_objects);
|
||||||
wo_end = 0;
|
wo_end = 0;
|
||||||
|
@ -513,6 +513,20 @@ void propagate_island_marks(struct commit *commit)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void free_island_marks(void)
|
||||||
|
{
|
||||||
|
struct island_bitmap *bitmap;
|
||||||
|
|
||||||
|
kh_foreach_value(island_marks, bitmap, {
|
||||||
|
if (!--bitmap->refcount)
|
||||||
|
free(bitmap);
|
||||||
|
});
|
||||||
|
kh_destroy_oid_map(island_marks);
|
||||||
|
|
||||||
|
/* detect use-after-free with a an address which is never valid: */
|
||||||
|
island_marks = (void *)-1;
|
||||||
|
}
|
||||||
|
|
||||||
int compute_pack_layers(struct packing_data *to_pack)
|
int compute_pack_layers(struct packing_data *to_pack)
|
||||||
{
|
{
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
|
@ -14,5 +14,6 @@ void resolve_tree_islands(struct repository *r,
|
|||||||
void load_delta_islands(struct repository *r, int progress);
|
void load_delta_islands(struct repository *r, int progress);
|
||||||
void propagate_island_marks(struct commit *commit);
|
void propagate_island_marks(struct commit *commit);
|
||||||
int compute_pack_layers(struct packing_data *to_pack);
|
int compute_pack_layers(struct packing_data *to_pack);
|
||||||
|
void free_island_marks(void);
|
||||||
|
|
||||||
#endif /* DELTA_ISLANDS_H */
|
#endif /* DELTA_ISLANDS_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user