From 4afb6fa4aae94b11354890ef9891bc62d6c22439 Mon Sep 17 00:00:00 2001 From: Liviu Chircu Date: Wed, 22 Jan 2020 13:00:22 +0200 Subject: [PATCH] HP_MALLOC: Do not attempt mem warming with non-HP allocator --- mem/shm_mem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mem/shm_mem.c b/mem/shm_mem.c index 24a419ff91..a9423e4fa6 100644 --- a/mem/shm_mem.c +++ b/mem/shm_mem.c @@ -659,12 +659,16 @@ mi_response_t *mi_shm_check(const mi_params_t *params, void init_shm_post_yyparse(void) { #ifdef HP_MALLOC - if (mem_warming_enabled && hp_mem_warming(shm_block) != 0) { - LM_INFO("skipped memory warming\n"); - } if (mem_allocator_shm == MM_HP_MALLOC || - mem_allocator_shm == MM_HP_MALLOC_DBG) + mem_allocator_shm == MM_HP_MALLOC_DBG) { + + if (mem_warming_enabled && hp_mem_warming(shm_block) != 0) + LM_INFO("skipped memory warming\n"); + hp_init_shm_statistics(shm_block); + } else if (mem_warming_enabled) { + LM_WARN("SHM memory warming only makes sense with HP_MALLOC!\n"); + } #endif #ifdef SHM_EXTRA_STATS