mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added sorting for findZone zonelist

Browse Source
This commit is contained in:
Dedmen Miller 2019-02-07 12:25:03 +01:00
parent 0e6350d95e
commit 92c872dfc0
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/TracyView.cpp
View File

@ -5669,11 +5669,11 @@ void View::DrawFindZone()
{ {
ImGui::Columns( 3, hdrString ); ImGui::Columns( 3, hdrString );
ImGui::Separator(); ImGui::Separator();
ImGui::Text( "Time from start" ); if( ImGui::SmallButton( "Time from start" ) ) m_findZoneSort = 0;
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::Text( "Execution time" ); if( ImGui::SmallButton( "Execution time" ) ) m_findZoneSort = 1;
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::Text( "Name" ); if( ImGui::SmallButton( "Name" ) ) m_findZoneSort = 2;
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(?)" ); ImGui::TextDisabled( "(?)" );
if( ImGui::IsItemHovered() ) if( ImGui::IsItemHovered() )
@ -5685,7 +5685,37 @@ void View::DrawFindZone()
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::Separator(); ImGui::Separator();
for( auto& ev : v->second.zones ) Vector<ZoneEvent*> sortedZones;
sortedZones.reserve_and_use( v->second.zones.size() );
std::copy(v->second.zones.begin(), v->second.zones.end(), sortedZones.begin());
switch( m_findZoneSort )
{
case 0:
//Already sorted by time from start
break;
case 1:
if( m_findZone.selfTime )
pdqsort_branchless( sortedZones.begin(), sortedZones.end(), [this]( const auto& lhs, const auto& rhs ) { return (m_worker.GetZoneEndDirect( *lhs ) - lhs->start - GetZoneChildTimeFast( *lhs )) > (m_worker.GetZoneEndDirect( *rhs ) - rhs->start - GetZoneChildTimeFast( *rhs )); } );
else
pdqsort_branchless( sortedZones.begin(), sortedZones.end(), [this]( const auto& lhs, const auto& rhs ) { return (m_worker.GetZoneEndDirect( *lhs ) - lhs->start) > (m_worker.GetZoneEndDirect( *rhs ) - rhs->start); } );
break;
case 2:
pdqsort_branchless( sortedZones.begin(), sortedZones.end(), [this]( const auto& lhs, const auto& rhs )
{
if (lhs->name.active != rhs->name.active) return lhs->name.active > rhs->name.active;
return strcmp(m_worker.GetString( lhs->name ), m_worker.GetString( rhs->name )) < 0;
} );
break;
default:
assert( false );
break;
}
for( auto& ev : sortedZones )
{ {
const auto end = m_worker.GetZoneEndDirect( *ev ); const auto end = m_worker.GetZoneEndDirect( *ev );
auto timespan = end - ev->start; auto timespan = end - ev->start;

1
server/TracyView.hpp
View File

@ -267,6 +267,7 @@ private:
bool m_goToFrame = false; bool m_goToFrame = false;
int m_statSort = 0; int m_statSort = 0;
int m_findZoneSort = 0;
bool m_statSelf = false; bool m_statSelf = false;
bool m_showCallstackFrameAddress = false; bool m_showCallstackFrameAddress = false;
bool m_showUnknownFrames = true; bool m_showUnknownFrames = true;