[Bf-blender-cvs] [b084736] master: BLI_ghash: Fix initial over-allocation of mempool chunks.

Bastien Montagne noreply at git.blender.org
Wed Jun 1 13:00:45 CEST 2016


Commit: b08473680e141ab6f28f99fc3b1dbbc4add89bed
Author: Bastien Montagne
Date:   Wed Jun 1 12:58:59 2016 +0200
Branches: master
https://developer.blender.org/rBb08473680e141ab6f28f99fc3b1dbbc4add89bed

BLI_ghash: Fix initial over-allocation of mempool chunks.

Code intended to create only one pool by default here, but code in `mempool_maxchunks()` would make it two.

===================================================================

M	source/blender/blenlib/intern/BLI_ghash.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 05f2d92..0b5adab 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -441,7 +441,7 @@ static GHash *ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info,
 	gh->flag = flag;
 
 	ghash_buckets_reset(gh, nentries_reserve);
-	gh->entrypool = BLI_mempool_create(GHASH_ENTRY_SIZE(flag & GHASH_FLAG_IS_GSET), 64, 64, BLI_MEMPOOL_NOP);
+	gh->entrypool = BLI_mempool_create(GHASH_ENTRY_SIZE(flag & GHASH_FLAG_IS_GSET), 0, 64, BLI_MEMPOOL_NOP);
 
 	return gh;
 }




More information about the Bf-blender-cvs mailing list