diff options
| -rw-r--r-- | libglusterfs/src/mem-pool.c | 29 | ||||
| -rw-r--r-- | libglusterfs/src/mem-types.h | 2 |
2 files changed, 29 insertions, 2 deletions
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c index b064837ac00..61ab8d379d4 100644 --- a/libglusterfs/src/mem-pool.c +++ b/libglusterfs/src/mem-pool.c @@ -594,6 +594,11 @@ mem_pools_fini (void) */ break; case 1: + { + per_thread_pool_list_t *pool_list; + per_thread_pool_list_t *next_pl; + unsigned int i; + /* if only mem_pools_init_early() was called, sweeper_tid will * be invalid and the functions will error out. That is not * critical. In all other cases, the sweeper_tid will be valid @@ -609,7 +614,28 @@ mem_pools_fini (void) * per_thread_pool_list_t structure. */ (void) pthread_key_delete (pool_key); + /* free all objects from all pools */ + list_for_each_entry_safe (pool_list, next_pl, + &pool_threads, thr_list) { + for (i = 0; i < NPOOLS; ++i) { + free_obj_list (pool_list->pools[i].hot_list); + free_obj_list (pool_list->pools[i].cold_list); + pool_list->pools[i].hot_list = NULL; + pool_list->pools[i].cold_list = NULL; + } + + list_del (&pool_list->thr_list); + FREE (pool_list); + } + + list_for_each_entry_safe (pool_list, next_pl, + &pool_free_threads, thr_list) { + list_del (&pool_list->thr_list); + FREE (pool_list); + } + /* Fall through. */ + } default: --init_count; } @@ -686,8 +712,7 @@ mem_get_pool_list (void) (void) pthread_mutex_unlock (&pool_free_lock); if (!pool_list) { - pool_list = GF_CALLOC (pool_list_size, 1, - gf_common_mt_mem_pool); + pool_list = CALLOC (pool_list_size, 1); if (!pool_list) { return NULL; } diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/mem-types.h index c2ac088f639..d244fb528e3 100644 --- a/libglusterfs/src/mem-types.h +++ b/libglusterfs/src/mem-types.h @@ -61,7 +61,9 @@ enum gf_common_mem_types_ { gf_common_mt_char, gf_common_mt_rbthash_table_t, gf_common_mt_rbthash_bucket, +#if defined(GF_DISABLE_MEMPOOL) gf_common_mt_mem_pool, +#endif gf_common_mt_long, gf_common_mt_rpcsvc_auth_list, gf_common_mt_rpcsvc_t, |