diff options
| -rw-r--r-- | vespamalloc/src/vespamalloc/malloc/datasegment.hpp | 5 | ||||
| -rw-r--r-- | vespamalloc/src/vespamalloc/util/callstack.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/datasegment.hpp b/vespamalloc/src/vespamalloc/malloc/datasegment.hpp index fe9d00decd0..281d5f98756 100644 --- a/vespamalloc/src/vespamalloc/malloc/datasegment.hpp +++ b/vespamalloc/src/vespamalloc/malloc/datasegment.hpp @@ -170,7 +170,6 @@ size_t DataSegment<MemBlockPtrT>::infoThread(FILE * os, int level, int thread, S size_t allocatedCount(0); size_t notAccounted(0); size_t invalidCallStacks(0); - size_t emptyCallStacks(0); std::unique_ptr<CallGraphLT> callGraph(new CallGraphLT); for(size_t i=0; i < NELEMS(_blockList); ) { const BlockT & b = _blockList[i]; @@ -199,9 +198,7 @@ size_t DataSegment<MemBlockPtrT>::infoThread(FILE * os, int level, int thread, S notAccounted++; } } else { - if (mem.callStackLen() == 0) { - emptyCallStacks++; - } else { + if (mem.callStackLen()) { invalidCallStacks++; } } diff --git a/vespamalloc/src/vespamalloc/util/callstack.h b/vespamalloc/src/vespamalloc/util/callstack.h index fa9640b2a2d..ca7c369bfea 100644 --- a/vespamalloc/src/vespamalloc/util/callstack.h +++ b/vespamalloc/src/vespamalloc/util/callstack.h @@ -75,6 +75,9 @@ size_t StackEntry<StackRep>::fillStack(StackEntry<StackRep> *stack, size_t nelem } else { sz = 0; } + if (sz < nelems) { + stack[sz] = StackEntry<StackRep>(); + } return sz; } |