From d6d03eff698a549ef46372e5b8e07be2be84d448 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 29 Jun 2021 10:36:09 +0000 Subject: GC unused atdoubledelete_loglevel --- vespamalloc/src/vespamalloc/malloc/malloc.h | 5 +---- vespamalloc/src/vespamalloc/malloc/memorywatcher.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'vespamalloc/src') diff --git a/vespamalloc/src/vespamalloc/malloc/malloc.h b/vespamalloc/src/vespamalloc/malloc/malloc.h index 51efe28eafc..5ea71d9ea47 100644 --- a/vespamalloc/src/vespamalloc/malloc/malloc.h +++ b/vespamalloc/src/vespamalloc/malloc/malloc.h @@ -61,8 +61,7 @@ public: { _segment.setupLog(noMemLogLevel, bigMemLogLevel, bigLimit, bigIncrement, allocs2Show); } - void setupLog(size_t doubleDelete, size_t invalidMem, size_t prAllocLimit) { - _doubleDeleteLogLevel = doubleDelete; + void setupLog(size_t invalidMem, size_t prAllocLimit) { _invalidMemLogLevel = invalidMem; _prAllocLimit = prAllocLimit; } @@ -76,7 +75,6 @@ private: void crash() __attribute__((noinline));; typedef AllocPoolT AllocPool; typedef typename ThreadListT::ThreadPool ThreadPool; - size_t _doubleDeleteLogLevel; size_t _invalidMemLogLevel; size_t _prAllocLimit; DataSegment _segment; @@ -87,7 +85,6 @@ private: template MemoryManager::MemoryManager(size_t logLimitAtStart) : IAllocator(), - _doubleDeleteLogLevel(1), _invalidMemLogLevel(1), _prAllocLimit(logLimitAtStart), _segment(), diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h index 2bb38541314..b992f4b264f 100644 --- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h +++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h @@ -61,7 +61,6 @@ private: atend_loglevel, pralloc_loglimit, atnomem_loglevel, - atdoubledelete_loglevel, atinvalid_loglevel, bigsegment_loglevel, bigsegment_limit, @@ -126,7 +125,6 @@ MemoryWatcher::Params::Params() _params[ atend_loglevel] = NameValuePair("atend_loglevel", "1"); _params[ pralloc_loglimit] = NameValuePair("pralloc_loglimit", "0x2000000"); _params[ atnomem_loglevel] = NameValuePair("atnomem_loglevel", "1"); - _params[atdoubledelete_loglevel] = NameValuePair("atdoubledelete_loglevel", "1"); _params[ atinvalid_loglevel] = NameValuePair("atinvalid_loglevel", "1"); _params[ bigsegment_loglevel] = NameValuePair("bigsegment_loglevel", "1"); _params[ bigsegment_limit] = NameValuePair("bigsegment_limit", "0x1000000000"); // 64GM @@ -212,8 +210,7 @@ void MemoryWatcher::activateOptions() _params[Params::bigsegment_limit].valueAsLong(), _params[Params::bigsegment_increment].valueAsLong(), _params[Params::allocs2show].valueAsLong()); - this->setupLog(_params[Params::atdoubledelete_loglevel].valueAsLong(), - _params[Params::atinvalid_loglevel].valueAsLong(), + this->setupLog(_params[Params::atinvalid_loglevel].valueAsLong(), _params[Params::pralloc_loglimit].valueAsLong()); this->setParams(_params[Params::alwaysreuselimit].valueAsLong(), _params[Params::threadcachelimit].valueAsLong()); -- cgit v1.2.3