From e9c5b61861299add8bf4b61382611cda68ebb68c Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 27 Jun 2017 07:21:28 -0700 Subject: libglusterfs: fix disable-mempool Change-Id: I55f707ae1e7c3ad7fc0545f7aa657584cead58f9 BUG: 1465214 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/17636 Smoke: Gluster Build System Tested-by: Jeff Darcy CentOS-regression: Gluster Build System Reviewed-by: Ji-Hyeon Gim Reviewed-by: Amar Tumballi --- libglusterfs/src/mem-pool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libglusterfs/src/mem-pool.c') diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c index fc07a1e25e6..8bed0a558b8 100644 --- a/libglusterfs/src/mem-pool.c +++ b/libglusterfs/src/mem-pool.c @@ -515,7 +515,6 @@ pool_destructor (void *arg) static __attribute__((constructor)) void mem_pools_preinit (void) { -#if !defined(GF_DISABLE_MEMPOOL) unsigned int i; /* Use a pthread_key destructor to clean up when a thread exits. */ @@ -538,16 +537,17 @@ mem_pools_preinit (void) pool_list_size = sizeof (per_thread_pool_list_t) + sizeof (per_thread_pool_t) * (NPOOLS - 1); -#endif } void mem_pools_init (void) { +#if !defined(GF_DISABLE_MEMPOOL) pthread_t kid; (void) pthread_create (&kid, NULL, pool_sweeper, NULL); (void) pthread_detach (kid); +#endif } struct mem_pool * @@ -667,7 +667,7 @@ void * mem_get (struct mem_pool *mem_pool) { #if defined(GF_DISABLE_MEMPOOL) - return GF_CALLOC (1, mem_pool->real_sizeof_type, + return GF_CALLOC (1, AVAILABLE_SIZE (mem_pool->power_of_two), gf_common_mt_mem_pool); #else per_thread_pool_list_t *pool_list; -- cgit