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

ListMemData() doesn't use id parameter.

Browse Source
This commit is contained in:
Bartosz Taudul 2023-04-16 17:30:53 +02:00
parent adb2f9a664
commit dec4713854
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyView.hpp
View File

@ -259,7 +259,7 @@ private:
void DrawSourceTooltip( const char* filename, uint32_t line, int before = 3, int after = 3, bool separateTooltip = true ); void DrawSourceTooltip( const char* filename, uint32_t line, int before = 3, int after = 3, bool separateTooltip = true );
void DrawWaitStacks(); void DrawWaitStacks();
void ListMemData( std::vector<const MemEvent*>& vec, const std::function<void(const MemEvent*)>& DrawAddress, const char* id = nullptr, int64_t startTime = -1, uint64_t pool = 0 ); void ListMemData( std::vector<const MemEvent*>& vec, const std::function<void(const MemEvent*)>& DrawAddress, int64_t startTime = -1, uint64_t pool = 0 );
unordered_flat_map<uint32_t, MemPathData> GetCallstackPaths( const MemData& mem, MemRange memRange ) const; unordered_flat_map<uint32_t, MemPathData> GetCallstackPaths( const MemData& mem, MemRange memRange ) const;
unordered_flat_map<uint64_t, MemCallstackFrameTree> GetCallstackFrameTreeBottomUp( const MemData& mem ) const; unordered_flat_map<uint64_t, MemCallstackFrameTree> GetCallstackFrameTreeBottomUp( const MemData& mem ) const;

8
server/TracyView_Memory.cpp
View File

@ -313,7 +313,7 @@ void View::DrawMemory()
{ {
ImGui::Text( "0x%" PRIx64 "+%" PRIu64, v->Ptr(), m_memInfo.ptrFind - v->Ptr() ); ImGui::Text( "0x%" PRIx64 "+%" PRIu64, v->Ptr(), m_memInfo.ptrFind - v->Ptr() );
} }
}, "##allocations", -1, m_memInfo.pool ); }, -1, m_memInfo.pool );
} }
} }
ImGui::TreePop(); ImGui::TreePop();
@ -362,7 +362,7 @@ void View::DrawMemory()
{ {
ListMemData( items, []( auto v ) { ListMemData( items, []( auto v ) {
ImGui::Text( "0x%" PRIx64, v->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, "##activeMem", -1, m_memInfo.pool ); }, -1, m_memInfo.pool );
} }
else else
{ {
@ -650,7 +650,7 @@ void View::DrawMemoryAllocWindow()
if( !show ) m_memoryAllocInfoWindow = -1; if( !show ) m_memoryAllocInfoWindow = -1;
} }
void View::ListMemData( std::vector<const MemEvent*>& vec, const std::function<void(const MemEvent*)>& DrawAddress, const char* id, int64_t startTime, uint64_t pool ) void View::ListMemData( std::vector<const MemEvent*>& vec, const std::function<void(const MemEvent*)>& DrawAddress, int64_t startTime, uint64_t pool )
{ {
if( startTime == -1 ) startTime = 0; if( startTime == -1 ) startTime = 0;
if( ImGui::BeginTable( "##mem", 8, ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_ScrollY, ImVec2( 0, ImGui::GetTextLineHeightWithSpacing() * std::min<int64_t>( 1+vec.size(), 15 ) ) ) ) if( ImGui::BeginTable( "##mem", 8, ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_ScrollY, ImVec2( 0, ImGui::GetTextLineHeightWithSpacing() * std::min<int64_t>( 1+vec.size(), 15 ) ) ) )
@ -918,7 +918,7 @@ void View::DrawAllocList()
TextFocused( "Number of allocations:", RealToString( m_memInfo.allocList.size() ) ); TextFocused( "Number of allocations:", RealToString( m_memInfo.allocList.size() ) );
ListMemData( data, []( auto v ) { ListMemData( data, []( auto v ) {
ImGui::Text( "0x%" PRIx64, v->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, "##allocations", -1, m_memInfo.pool ); }, -1, m_memInfo.pool );
ImGui::End(); ImGui::End();
} }

2
server/TracyView_ZoneInfo.cpp
View File

@ -848,7 +848,7 @@ void View::DrawZoneInfoWindow()
ListMemData( v, []( auto v ) { ListMemData( v, []( auto v ) {
ImGui::Text( "0x%" PRIx64, v->Ptr() ); ImGui::Text( "0x%" PRIx64, v->Ptr() );
}, nullptr, m_allocTimeRelativeToZone ? ev.Start() : -1, m_zoneInfoMemPool ); }, m_allocTimeRelativeToZone ? ev.Start() : -1, m_zoneInfoMemPool );
ImGui::TreePop(); ImGui::TreePop();
} }
} }