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

Allow sorting memory data listings.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-02-05 17:05:15 +01:00
parent 9aecd43f24
commit 0bb6162a01
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
server/TracyView.cpp
View File

@ -6229,8 +6229,8 @@ void View::DrawZoneInfoWindow()
} }
pdqsort_branchless( v.begin(), v.end(), [] ( const auto& l, const auto& r ) { return l->TimeAlloc() < r->TimeAlloc(); } ); pdqsort_branchless( v.begin(), v.end(), [] ( const auto& l, const auto& r ) { return l->TimeAlloc() < r->TimeAlloc(); } );
ListMemData<decltype( v.begin() )>( v.begin(), v.end(), []( auto v ) { ListMemData( v, []( auto v ) {
ImGui::Text( "0x%" PRIx64, (*v)->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, nullptr, m_allocTimeRelativeToZone ? ev.Start() : -1 ); }, nullptr, m_allocTimeRelativeToZone ? ev.Start() : -1 );
ImGui::TreePop(); ImGui::TreePop();
} }
@ -12607,28 +12607,37 @@ void View::DrawAnnotationList()
ImGui::End(); ImGui::End();
} }
template<class T> void View::ListMemData( std::vector<const MemEvent*>& vec, std::function<void(const MemEvent*)> DrawAddress, const char* id, int64_t startTime )
void View::ListMemData( T ptr, T end, std::function<void(T)> DrawAddress, const char* id, int64_t startTime )
{ {
if( startTime == -1 ) startTime = 0; if( startTime == -1 ) startTime = 0;
const auto& style = ImGui::GetStyle(); const auto& style = ImGui::GetStyle();
const auto dist = std::distance( ptr, end ) + 1; const auto dist = vec.size() + 1;
const auto ty = ImGui::GetTextLineHeight() + style.ItemSpacing.y; const auto ty = ImGui::GetTextLineHeight() + style.ItemSpacing.y;
enum class SortBy
{
Address,
Size,
AllocTime,
Duration
};
static SortBy sortBy = SortBy::AllocTime;
ImGui::BeginChild( id ? id : "##memScroll", ImVec2( 0, std::max( ty * std::min<int64_t>( dist, 5 ), std::min( ty * dist, ImGui::GetContentRegionAvail().y ) ) ) ); ImGui::BeginChild( id ? id : "##memScroll", ImVec2( 0, std::max( ty * std::min<int64_t>( dist, 5 ), std::min( ty * dist, ImGui::GetContentRegionAvail().y ) ) ) );
ImGui::Columns( 8 ); ImGui::Columns( 8 );
ImGui::TextUnformatted( "Address" ); if( ImGui::SmallButton( "Address" ) ) sortBy = SortBy::Address;
ImGui::SameLine(); ImGui::SameLine();
DrawHelpMarker( "Click on address to display memory allocation info window.\nMiddle click to zoom to allocation range." ); DrawHelpMarker( "Click on address to display memory allocation info window.\nMiddle click to zoom to allocation range." );
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( "Size" ); if( ImGui::SmallButton( "Size" ) ) sortBy = SortBy::Size;
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( "Appeared at" ); if( ImGui::SmallButton( "Appeared at" ) ) sortBy = SortBy::AllocTime;
ImGui::SameLine(); ImGui::SameLine();
DrawHelpMarker( "Click on entry to center timeline at the memory allocation time." ); DrawHelpMarker( "Click on entry to center timeline at the memory allocation time." );
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( "Duration" ); if( ImGui::SmallButton( "Duration" ) ) sortBy = SortBy::Duration;
ImGui::SameLine(); ImGui::SameLine();
DrawHelpMarker( "Active allocations are displayed using green color.\nClick on entry to center timeline at the memory release time." ); DrawHelpMarker( "Active allocations are displayed using green color.\nClick on entry to center timeline at the memory release time." );
ImGui::NextColumn(); ImGui::NextColumn();
@ -12648,24 +12657,42 @@ void View::ListMemData( T ptr, T end, std::function<void(T)> DrawAddress, const
const auto& mem = m_worker.GetMemData(); const auto& mem = m_worker.GetMemData();
switch( sortBy )
{
case SortBy::Address:
pdqsort_branchless( vec.begin(), vec.end(), []( const auto& l, const auto& r ) { return l->Ptr() < r->Ptr(); } );
break;
case SortBy::AllocTime:
break;
case SortBy::Duration:
pdqsort_branchless( vec.begin(), vec.end(), []( const auto& l, const auto& r ) { return ( l->TimeFree() - l->TimeAlloc() ) < ( r->TimeFree() - r->TimeAlloc() ); } );
break;
case SortBy::Size:
pdqsort_branchless( vec.begin(), vec.end(), []( const auto& l, const auto& r ) { return l->Size() < r->Size(); } );
break;
default:
assert( false );
break;
}
int idx = 0; int idx = 0;
ImGuiListClipper clipper( end - ptr ); ImGuiListClipper clipper( vec.end() - vec.begin() );
while( clipper.Step() ) while( clipper.Step() )
{ {
for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ ) for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ )
{ {
auto v = ptr[i]; auto v = vec[i];
const auto arrIdx = std::distance( mem.data.begin(), v ); const auto arrIdx = std::distance( mem.data.begin(), v );
if( m_memoryAllocInfoWindow == arrIdx ) if( m_memoryAllocInfoWindow == arrIdx )
{ {
ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 1.f, 0.f, 0.f, 1.f ) ); ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 1.f, 0.f, 0.f, 1.f ) );
DrawAddress( ptr+i ); DrawAddress( v );
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} }
else else
{ {
DrawAddress( ptr+i ); DrawAddress( v );
if( ImGui::IsItemClicked() ) if( ImGui::IsItemClicked() )
{ {
m_memoryAllocInfoWindow = arrIdx; m_memoryAllocInfoWindow = arrIdx;
@ -13271,8 +13298,7 @@ void View::DrawMemory()
} }
else else
{ {
ListMemData<decltype( match.begin() )>( match.begin(), match.end(), [this]( auto it ) { ListMemData( match, [this]( auto v ) {
auto& v = *it;
if( v->Ptr() == m_memInfo.ptrFind ) if( v->Ptr() == m_memInfo.ptrFind )
{ {
ImGui::Text( "0x%" PRIx64, m_memInfo.ptrFind ); ImGui::Text( "0x%" PRIx64, m_memInfo.ptrFind );
@ -13328,8 +13354,8 @@ void View::DrawMemory()
if( !items.empty() ) if( !items.empty() )
{ {
ListMemData<decltype( items.begin() )>( items.begin(), items.end(), []( auto v ) { ListMemData( items, []( auto v ) {
ImGui::Text( "0x%" PRIx64, (*v)->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, "##activeMem" ); }, "##activeMem" );
} }
else else
@ -13598,8 +13624,8 @@ void View::DrawAllocList()
ImGui::SetNextWindowSize( ImVec2( 1100, 500 ), ImGuiCond_FirstUseEver ); ImGui::SetNextWindowSize( ImVec2( 1100, 500 ), ImGuiCond_FirstUseEver );
ImGui::Begin( "Allocations list", &m_memInfo.showAllocList ); ImGui::Begin( "Allocations list", &m_memInfo.showAllocList );
TextFocused( "Number of allocations:", RealToString( m_memInfo.allocList.size() ) ); TextFocused( "Number of allocations:", RealToString( m_memInfo.allocList.size() ) );
ListMemData<decltype( data.begin() )>( data.begin(), data.end(), []( auto v ) { ListMemData( data, []( auto v ) {
ImGui::Text( "0x%" PRIx64, (*v)->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, "##allocations" ); }, "##allocations" );
ImGui::End(); ImGui::End();
} }

3
server/TracyView.hpp
View File

@ -153,8 +153,7 @@ private:
void DrawSelectedAnnotation(); void DrawSelectedAnnotation();
void DrawAnnotationList(); void DrawAnnotationList();
template<class T> void ListMemData( std::vector<const MemEvent*>& vec, std::function<void(const MemEvent*)> DrawAddress, const char* id = nullptr, int64_t startTime = -1 );
void ListMemData( T ptr, T end, std::function<void(T)> DrawAddress, const char* id = nullptr, int64_t startTime = -1 );
unordered_flat_map<uint32_t, PathData> GetCallstackPaths( const MemData& mem, bool onlyActive ) const; unordered_flat_map<uint32_t, PathData> GetCallstackPaths( const MemData& mem, bool onlyActive ) const;
unordered_flat_map<uint64_t, CallstackFrameTree> GetCallstackFrameTreeBottomUp( const MemData& mem ) const; unordered_flat_map<uint64_t, CallstackFrameTree> GetCallstackFrameTreeBottomUp( const MemData& mem ) const;