From 1cfd0c587d72c7b06f2a882670bd1b9aad6c43a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com> Date: Tue, 3 May 2016 22:30:45 +0200 Subject: [PATCH] memory measurement fix --- alib2common/src/measurements/frames/MemoryDataFrame.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alib2common/src/measurements/frames/MemoryDataFrame.cpp b/alib2common/src/measurements/frames/MemoryDataFrame.cpp index 144624aafb..c0dcb5fbde 100644 --- a/alib2common/src/measurements/frames/MemoryDataFrame.cpp +++ b/alib2common/src/measurements/frames/MemoryDataFrame.cpp @@ -36,12 +36,12 @@ void MemoryDataFrame::update ( unsigned frameIdx, measurements::stealth_vector < if ( currentFrame.memory.currentHeapUsage > currentFrame.memory.inFrameHighWatermark ) currentFrame.memory.inFrameHighWatermark = currentFrame.memory.currentHeapUsage; - if ( parentFrame.memory.highWatermark < currentFrame.memory.inFrameHighWatermark ) - parentFrame.memory.highWatermark = currentFrame.memory.inFrameHighWatermark; - if ( currentFrame.memory.highWatermark < currentFrame.memory.inFrameHighWatermark ) currentFrame.memory.highWatermark = currentFrame.memory.inFrameHighWatermark; + if ( parentFrame.memory.highWatermark < currentFrame.memory.highWatermark ) + parentFrame.memory.highWatermark = currentFrame.memory.highWatermark; + parentFrame.memory.currentHeapUsage = currentFrame.memory.currentHeapUsage; } -- GitLab