Use tables in CPU data view.

server/TracyView.cpp

@@ -14897,30 +14897,75 @@ void View::DrawCpuDataWindow()
     TextFocused( "Tracked processes:", RealToString( pids.size() ) );
     ImGui::Separator();
     ImGui::BeginChild( "##cpudata" );
-    ImGui::Columns( 5 );
+    if( ImGui::BeginTable( "##cpudata", 5, ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_ScrollY ) )
-    if( ImGui::SmallButton( "PID/TID" ) ) m_cpuDataSort = CpuDataSortBy::Pid;
+    {
-    ImGui::NextColumn();
+        ImGui::TableSetupScrollFreeze( 0, 1 );
-    if( ImGui::SmallButton( "Name" ) ) m_cpuDataSort = CpuDataSortBy::Name;
+        ImGui::TableSetupColumn( "PID/TID" );
-    ImGui::NextColumn();
+        ImGui::TableSetupColumn( "Name" );
-    if( ImGui::SmallButton( "Running time" ) ) m_cpuDataSort = CpuDataSortBy::Time;
+        ImGui::TableSetupColumn( "Running time", ImGuiTableColumnFlags_PreferSortDescending );
-    ImGui::NextColumn();
+        ImGui::TableSetupColumn( "Running regions", ImGuiTableColumnFlags_PreferSortDescending );
-    if( ImGui::SmallButton( "Running regions" ) ) m_cpuDataSort = CpuDataSortBy::Regions;
+        ImGui::TableSetupColumn( "CPU migrations", ImGuiTableColumnFlags_PreferSortDescending );
-    ImGui::NextColumn();
+        ImGui::TableHeadersRow();
-    if( ImGui::SmallButton( "CPU migrations" ) ) m_cpuDataSort = CpuDataSortBy::Migrations;
-    ImGui::NextColumn();
-    ImGui::Separator();
 
         std::vector<unordered_flat_map<uint64_t, PidData>::iterator> psort;
         psort.reserve( pids.size() );
         for( auto it = pids.begin(); it != pids.end(); ++it ) psort.emplace_back( it );
-    switch( m_cpuDataSort )
+        const auto& sortspec = *ImGui::TableGetSortSpecs()->Specs;
+        switch( sortspec.ColumnIndex )
         {
-    case CpuDataSortBy::Pid: pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->first < r->first; } ); break;
+        case 0:
-    case CpuDataSortBy::Name: pdqsort_branchless( psort.begin(), psort.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l->second.tids[0] ).first, m_worker.GetExternalName( r->second.tids[0] ).first ) < 0; } ); break;
+            if( sortspec.SortDirection == ImGuiSortDirection_Descending )
-    case CpuDataSortBy::Time: pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningTime > r->second.data.runningTime; } ); break;
+            {
-    case CpuDataSortBy::Regions: pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningRegions > r->second.data.runningRegions; } ); break;
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->first > r->first; } );
-    case CpuDataSortBy::Migrations: pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.migrations > r->second.data.migrations; } ); break;
+            }
-    default: assert( false ); break;
+            else
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->first < r->first; } );
+            }
+            break;
+        case 1:
+            if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l->second.tids[0] ).first, m_worker.GetExternalName( r->second.tids[0] ).first ) > 0; } );
+            }
+            else
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l->second.tids[0] ).first, m_worker.GetExternalName( r->second.tids[0] ).first ) < 0; } );
+            }
+            break;
+        case 2:
+            if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningTime > r->second.data.runningTime; } );
+            }
+            else
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningTime < r->second.data.runningTime; } );
+            }
+            break;
+        case 3:
+            if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningRegions > r->second.data.runningRegions; } );
+            }
+            else
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.runningRegions < r->second.data.runningRegions; } );
+            }
+            break;
+        case 4:
+            if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.migrations > r->second.data.migrations; } );
+            }
+            else
+            {
+                pdqsort_branchless( psort.begin(), psort.end(), [] ( const auto& l, const auto& r ) { return l->second.data.migrations < r->second.data.migrations; } );
+            }
+            break;
+        default:
+            assert( false );
+            break;
         }
 
         const auto thisPid = m_worker.GetPid();
@@ -14929,6 +14974,9 @@ void View::DrawCpuDataWindow()
 
         for( auto& pidit : psort )
         {
+            ImGui::TableNextRow();
+            ImGui::TableNextColumn();
+
             char buf[128];
             auto& pid = *pidit;
             const auto pidMatch = thisPid != 0 && thisPid == pid.first;
@@ -14955,7 +15003,7 @@ void View::DrawCpuDataWindow()
                 ImGui::SameLine();
                 ImGui::TextDisabled( "(%s)", RealToString( tsz ) );
             }
-        ImGui::NextColumn();
+            ImGui::TableNextColumn();
             ImGui::TextUnformatted( pid.first == 0 ? "???" : name );
             if( ImGui::IsItemHovered() )
             {
@@ -14966,31 +15014,80 @@ void View::DrawCpuDataWindow()
                 }
                 m_drawThreadHighlight = pid.first;
             }
-        ImGui::NextColumn();
+            ImGui::TableNextColumn();
             PrintStringPercent( buf, TimeToString( pid.second.data.runningTime ), double( pid.second.data.runningTime ) * rtimespan * 100 );
             ImGui::ProgressBar( double( pid.second.data.runningTime ) * rtimespan, ImVec2( -1, ty ), buf );
-        ImGui::NextColumn();
+            ImGui::TableNextColumn();
             ImGui::TextUnformatted( RealToString( pid.second.data.runningRegions ) );
-        ImGui::NextColumn();
+            ImGui::TableNextColumn();
             ImGui::TextUnformatted( RealToString( pid.second.data.migrations ) );
             ImGui::SameLine();
             PrintStringPercent( buf, double( pid.second.data.migrations ) / pid.second.data.runningRegions * 100 );
             TextDisabledUnformatted( buf );
-        ImGui::NextColumn();
             if( expand )
             {
                 ImGui::Separator();
-            switch( m_cpuDataSort )
+                switch( sortspec.ColumnIndex )
                 {
-            case CpuDataSortBy::Pid: pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end() ); break;
+                case 0:
-            case CpuDataSortBy::Name: pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l ).second, m_worker.GetExternalName( r ).second ) < 0; } ); break;
+                    if( sortspec.SortDirection == ImGuiSortDirection_Descending )
-            case CpuDataSortBy::Time: pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningTime > ctd.find( r )->second.runningTime; } ); break;
+                    {
-            case CpuDataSortBy::Regions: pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningRegions > ctd.find( r )->second.runningRegions; } ); break;
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), []( const auto& l, const auto& r ) { return l > r; } );
-            case CpuDataSortBy::Migrations: pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.migrations > ctd.find( r )->second.migrations; } ); break;
+                    }
-            default: assert( false ); break;
+                    else
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end() );
+                    }
+                    break;
+                case 1:
+                    if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l ).second, m_worker.GetExternalName( r ).second ) > 0; } );
+                    }
+                    else
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [this] ( const auto& l, const auto& r ) { return strcmp( m_worker.GetExternalName( l ).second, m_worker.GetExternalName( r ).second ) < 0; } );
+                    }
+                    break;
+                case 2:
+                    if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningTime > ctd.find( r )->second.runningTime; } );
+                    }
+                    else
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningTime < ctd.find( r )->second.runningTime; } );
+                    }
+                    break;
+                case 3:
+                    if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningRegions > ctd.find( r )->second.runningRegions; } );
+                    }
+                    else
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.runningRegions < ctd.find( r )->second.runningRegions; } );
+                    }
+                    break;
+                case 4:
+                    if( sortspec.SortDirection == ImGuiSortDirection_Descending )
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.migrations > ctd.find( r )->second.migrations; } );
+                    }
+                    else
+                    {
+                        pdqsort_branchless( pid.second.tids.begin(), pid.second.tids.end(), [&ctd] ( const auto& l, const auto& r ) { return ctd.find( l )->second.migrations < ctd.find( r )->second.migrations; } );
+                    }
+                    break;
+                default:
+                    assert( false );
+                    break;
                 }
                 for( auto& tid : pid.second.tids )
                 {
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+
                     const auto tidMatch = pidMatch && m_worker.IsThreadLocal( tid );
                     const char* tname;
                     if( tidMatch )
@@ -15014,7 +15111,7 @@ void View::DrawCpuDataWindow()
                         }
                         m_drawThreadHighlight = tid;
                     }
-                ImGui::NextColumn();
+                    ImGui::TableNextColumn();
                     if( tidMatch )
                     {
                         SmallColorBox( GetThreadColor( tid, 0 ) );
@@ -15030,17 +15127,16 @@ void View::DrawCpuDataWindow()
                         }
                         m_drawThreadHighlight = tid;
                     }
-                ImGui::NextColumn();
+                    ImGui::TableNextColumn();
                     PrintStringPercent( buf, TimeToString( tit->second.runningTime ), double( tit->second.runningTime ) * rtimespan * 100 );
                     ImGui::ProgressBar( double( tit->second.runningTime ) * rtimespan, ImVec2( -1, ty ), buf );
-                ImGui::NextColumn();
+                    ImGui::TableNextColumn();
                     ImGui::TextUnformatted( RealToString( tit->second.runningRegions ) );
-                ImGui::NextColumn();
+                    ImGui::TableNextColumn();
                     ImGui::TextUnformatted( RealToString( tit->second.migrations ) );
                     ImGui::SameLine();
                     PrintStringPercent( buf, double( tit->second.migrations ) / tit->second.runningRegions * 100 );
                     TextDisabledUnformatted( buf );
-                ImGui::NextColumn();
                     if( tidMatch )
                     {
                         ImGui::PopStyleColor();
@@ -15054,7 +15150,8 @@ void View::DrawCpuDataWindow()
                 ImGui::PopStyleColor();
             }
         }
-    ImGui::EndColumns();
+        ImGui::EndTable();
+    }
     ImGui::EndChild();
     ImGui::End();
 }

server/TracyView.hpp

@@ -386,17 +386,6 @@ private:
     bool m_showCpuDataWindow = false;
     bool m_showAnnotationList = false;
 
-    enum class CpuDataSortBy
-    {
-        Pid,
-        Name,
-        Time,
-        Regions,
-        Migrations
-    };
-
-    CpuDataSortBy m_cpuDataSort = CpuDataSortBy::Pid;
-
     bool m_statSelf = true;
     bool m_statSampleTime = true;
     int m_statMode = 0;