mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-29 16:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly filter allocations in memory call tree

Browse Source 
Fix #723: Memory: active allocations are incorrectly displayed in call stack tree

The range we were looking for was wrong (should be Active instead of
Inactive), but I also reworked to make the comparison clearer.

Test

Using the repro app from the bug:
1. Click "Free + Allocate" once
1. Call stack tree shows 2 entries under "Active allocations", 1 active
   allocation, 0 inactive allocations in the call stack tree.
1. Click "Free + Allocate" several times
1. Call stack tree shows 1 KB of active allocations and many KB of
   inactive.
This commit is contained in:
David Briscoe 2024-02-15 10:24:59 -08:00
parent 3c4b06dff5
commit 255e3d2829
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/TracyView_FrameTree.cpp
View File

@ -58,6 +58,8 @@ unordered_flat_map<uint32_t, View::MemPathData> View::GetCallstackPaths( const M
unordered_flat_map<uint32_t, MemPathData> pathSum; unordered_flat_map<uint32_t, MemPathData> pathSum;
pathSum.reserve( m_worker.GetCallstackPayloadCount() ); pathSum.reserve( m_worker.GetCallstackPayloadCount() );
const bool hide_inactive = memRange == MemRange::Active;
if( m_memInfo.range.active ) if( m_memInfo.range.active )
{ {
auto it = std::lower_bound( mem.data.begin(), mem.data.end(), m_memInfo.range.min, []( const auto& lhs, const auto& rhs ) { return lhs.TimeAlloc() < rhs; } ); auto it = std::lower_bound( mem.data.begin(), mem.data.end(), m_memInfo.range.min, []( const auto& lhs, const auto& rhs ) { return lhs.TimeAlloc() < rhs; } );
@ -70,7 +72,8 @@ unordered_flat_map<uint32_t, View::MemPathData> View::GetCallstackPaths( const M
{ {
auto& ev = *it++; auto& ev = *it++;
if( ev.CsAlloc() == 0 ) continue; if( ev.CsAlloc() == 0 ) continue;
if( ( memRange == MemRange::Inactive ) == ( ev.TimeFree() >= 0 && ev.TimeFree() < m_memInfo.range.max ) ) continue; const bool is_inactive = ev.TimeFree() >= 0 && ev.TimeFree() < m_memInfo.range.max;
if( hide_inactive == is_inactive ) continue;
auto pit = pathSum.find( ev.CsAlloc() ); auto pit = pathSum.find( ev.CsAlloc() );
if( pit == pathSum.end() ) if( pit == pathSum.end() )
{ {
@ -110,7 +113,8 @@ unordered_flat_map<uint32_t, View::MemPathData> View::GetCallstackPaths( const M
for( auto& ev : mem.data ) for( auto& ev : mem.data )
{ {
if( ev.CsAlloc() == 0 ) continue; if( ev.CsAlloc() == 0 ) continue;
if( ( memRange == MemRange::Inactive ) == ( ev.TimeFree() >= 0 ) ) continue; const bool is_inactive = ev.TimeFree() >= 0;
if( hide_inactive == is_inactive ) continue;
auto it = pathSum.find( ev.CsAlloc() ); auto it = pathSum.find( ev.CsAlloc() );
if( it == pathSum.end() ) if( it == pathSum.end() )
{ {