From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue, 6 Dec 2016 12:53:35 +0000 (+0700)
Subject: shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
X-Git-Tag: v2.11.1~46^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bc3d8c5ec04cdfaa7dc14aed1993f3bb376d9ae;p=thirdparty%2Fgit.git

shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools

We need to allocate a "big" block of memory in paint_alloc(). The exact
size does not really matter. But the pool size has no relation with
commit-slab. Stop using that macro here.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/shallow.c b/shallow.c
index 57b5fc7b92..91aa59d4b8 100644
--- a/shallow.c
+++ b/shallow.c
@@ -353,6 +353,8 @@ void remove_nonexistent_theirs_shallow(struct shallow_info *info)
 
 define_commit_slab(ref_bitmap, uint32_t *);
 
+#define POOL_SIZE (512 * 1024)
+
 struct paint_info {
 	struct ref_bitmap ref_bitmap;
 	unsigned nr_bits;
@@ -369,9 +371,9 @@ static uint32_t *paint_alloc(struct paint_info *info)
 	if (!info->pool_count || info->free + size > info->end) {
 		info->pool_count++;
 		REALLOC_ARRAY(info->pools, info->pool_count);
-		info->free = xmalloc(COMMIT_SLAB_SIZE);
+		info->free = xmalloc(POOL_SIZE);
 		info->pools[info->pool_count - 1] = info->free;
-		info->end = info->free + COMMIT_SLAB_SIZE;
+		info->end = info->free + POOL_SIZE;
 	}
 	p = info->free;
 	info->free += size;