aboutsummaryrefslogtreecommitdiffstats
path: root/vespamalloc/src/vespamalloc/malloc/malloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'vespamalloc/src/vespamalloc/malloc/malloc.h')
-rw-r--r--vespamalloc/src/vespamalloc/malloc/malloc.h23
1 files changed, 6 insertions, 17 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/malloc.h b/vespamalloc/src/vespamalloc/malloc/malloc.h
index 51efe28eafc..f9a749c006e 100644
--- a/vespamalloc/src/vespamalloc/malloc/malloc.h
+++ b/vespamalloc/src/vespamalloc/malloc/malloc.h
@@ -53,22 +53,15 @@ public:
void info(FILE * os, size_t level=0) __attribute__ ((noinline));
- void setupSegmentLog(size_t noMemLogLevel,
- size_t bigMemLogLevel,
- size_t bigLimit,
- size_t bigIncrement,
- size_t allocs2Show)
- {
- _segment.setupLog(noMemLogLevel, bigMemLogLevel, bigLimit, bigIncrement, allocs2Show);
+ void setupSegmentLog(size_t bigMemLogLevel, size_t bigLimit, size_t bigIncrement, size_t allocs2Show) {
+ _segment.setupLog(bigMemLogLevel, bigLimit, bigIncrement, allocs2Show);
}
- void setupLog(size_t doubleDelete, size_t invalidMem, size_t prAllocLimit) {
- _doubleDeleteLogLevel = doubleDelete;
- _invalidMemLogLevel = invalidMem;
+ void setupLog(size_t prAllocLimit) {
_prAllocLimit = prAllocLimit;
}
- void setParams(size_t alwayReuseLimit, size_t threadCacheLimit) {
- _threadList.setParams(alwayReuseLimit, threadCacheLimit);
- _allocPool.setParams(alwayReuseLimit, threadCacheLimit);
+ void setParams(size_t threadCacheLimit) {
+ _threadList.setParams(threadCacheLimit);
+ _allocPool.setParams(threadCacheLimit);
}
const DataSegment<MemBlockPtrT> & dataSegment() const { return _segment; }
private:
@@ -76,8 +69,6 @@ private:
void crash() __attribute__((noinline));;
typedef AllocPoolT<MemBlockPtrT> AllocPool;
typedef typename ThreadListT::ThreadPool ThreadPool;
- size_t _doubleDeleteLogLevel;
- size_t _invalidMemLogLevel;
size_t _prAllocLimit;
DataSegment<MemBlockPtrT> _segment;
AllocPool _allocPool;
@@ -87,8 +78,6 @@ private:
template <typename MemBlockPtrT, typename ThreadListT>
MemoryManager<MemBlockPtrT, ThreadListT>::MemoryManager(size_t logLimitAtStart) :
IAllocator(),
- _doubleDeleteLogLevel(1),
- _invalidMemLogLevel(1),
_prAllocLimit(logLimitAtStart),
_segment(),
_allocPool(_segment),