From 51494bc69e7de18f3c1949593c8cbbc1c6f8b100 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 24 Mar 2016 23:12:23 +1300 Subject: [PATCH] Reduce scope of MemIsInitialized --- src/mem/old_api.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc index b9d28b5db8..3ef4419885 100644 --- a/src/mem/old_api.cc +++ b/src/mem/old_api.cc @@ -46,9 +46,6 @@ static void memStringStats(std::ostream &); static double xm_time = 0; static double xm_deltat = 0; -/* all pools are ready to be used */ -static bool MemIsInitialized = false; - /* string pools */ #define mem_str_pool_count 6 @@ -246,7 +243,6 @@ memAllocString(size_t net_size, size_t * gross_size) *gross_size = pool ? pool->objectSize() : net_size; assert(*gross_size >= net_size); - // may forget [de]allocations until MemIsInitialized ++StrCountMeter; StrVolumeMeter += *gross_size; return pool ? pool->alloc() : xcalloc(1, net_size); @@ -274,7 +270,6 @@ memFreeString(size_t size, void *buf) if (type != MEM_NONE) pool = GetStrPool(type); - // may forget [de]allocations until MemIsInitialized --StrCountMeter; StrVolumeMeter -= size; pool ? pool->freeOne(buf) : xfree(buf); @@ -415,6 +410,11 @@ memConfigure(void) void Mem::Init(void) { + /* all pools are ready to be used */ + static bool MemIsInitialized = false; + if (MemIsInitialized) + return; + /** \par * NOTE: Mem::Init() is called before the config file is parsed * and before the debugging module has been initialized. Any -- 2.47.3