More tests

Author: kunitoki

modules/yup_gui/component/yup_Component.cpp

@@ -1210,15 +1210,10 @@ String Component::getPaintProfileName() const
     return "Component";
 }
 
-//==============================================================================
+thread_local std::vector<PaintProfileScopeEntry> Component::paintProfileScopeStack {};
+std::atomic<uint64> Component::globalPaintIndexCounter { 0 };
 
-struct PaintProfileScopeEntry
-{
-    double childrenMicros = 0.0;
-};
-
-thread_local std::vector<PaintProfileScopeEntry> paintProfileScopeStack;
-static std::atomic<uint64> globalPaintIndexCounter { 0 };
+//==============================================================================
 
 class PaintProfileScope
 {
@@ -1233,20 +1228,20 @@ class PaintProfileScope
         , selfStartMicros (0.0)
     {
         sample.frameIndex = frameIndex;
-        sample.paintIndex = globalPaintIndexCounter.fetch_add (1, std::memory_order_relaxed);
+        sample.paintIndex = Component::globalPaintIndexCounter.fetch_add (1, std::memory_order_relaxed);
         sample.repaintArea = repaintArea;
         sample.componentBounds = component.getBoundsRelativeToTopLevelComponent().to<float>();
         sample.renderContinuous = renderContinuous;
 
-        paintProfileScopeStack.push_back ({});
+        Component::paintProfileScopeStack.push_back ({});
     }
 
     ~PaintProfileScope()
     {
         const double totalEndMicros = ticksToMicros (Time::getHighResolutionTicks());
         sample.totalMicros = totalEndMicros - totalStartMicros;
-        sample.childrenMicros = paintProfileScopeStack.back().childrenMicros;
-        paintProfileScopeStack.pop_back();
+        sample.childrenMicros = Component::paintProfileScopeStack.back().childrenMicros;
+        Component::paintProfileScopeStack.pop_back();
 
         sample.frameworkMicros = std::max (0.0,
                                            sample.totalMicros
@@ -1256,8 +1251,8 @@ class PaintProfileScope
         if (auto* stats = component.getPaintProfileStats())
             stats->recordSample (sample);
 
-        if (! paintProfileScopeStack.empty())
-            paintProfileScopeStack.back().childrenMicros += sample.totalMicros;
+        if (! Component::paintProfileScopeStack.empty())
+            Component::paintProfileScopeStack.back().childrenMicros += sample.totalMicros;
     }
 
     void beginSelf()

modules/yup_gui/component/yup_Component.h

@@ -1351,7 +1351,10 @@ class YUP_API Component : public MouseListener
 #endif
 
 #if YUP_ENABLE_COMPONENT_PAINT_PROFILING
+    friend class PaintProfileScope;
     std::unique_ptr<PaintProfileStats> paintProfileStats;
+    static thread_local std::vector<PaintProfileScopeEntry> paintProfileScopeStack;
+    static std::atomic<uint64> globalPaintIndexCounter;
 #endif
 
     YUP_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Component)

modules/yup_gui/profiling/yup_PaintProfileSample.h

@@ -135,6 +135,21 @@ struct PaintProfileSummary
 
 //==============================================================================
 
+/** A struct used to track the cumulative child time of nested paint calls in the current call stack.
+ 
+    This is stored in a thread_local stack in Component, and each PaintProfileScope pushes a new entry on
+    construction and pops it on destruction. The self time of a scope is accumulated separately, and the total
+    time of the scope is added to the parent's childrenMicros when the scope ends, so that the sum of selfMicros
+    and childrenMicros for a parent scope equals the total time spent in that subtree of the paint call graph.
+*/
+struct PaintProfileScopeEntry
+{
+    /** Cumulative time spent in child paint calls for the current scope. */
+    double childrenMicros = 0.0;
+};
+
+//==============================================================================
+
 /** A linear histogram of sample values for a single PaintProfileTimeKind field.
 
     The range [rangeMinMicros, rangeMaxMicros] is divided into buckets.size() equal-width

tests/CMakeLists.txt

@@ -123,6 +123,7 @@ yup_standalone_app (
     TARGET_CONSOLE ${target_console}
     DEFINITIONS
         YUP_USE_CURL=0
+        YUP_ENABLE_COMPONENT_PAINT_PROFILING=1
         YUP_MODAL_LOOPS_PERMITTED=1
     PRELOAD_FILES
         ${target_preloaded}

tests/yup_gui.cpp

@@ -26,6 +26,7 @@
 #include "yup_gui/yup_FileChooser.cpp"
 #include "yup_gui/yup_Label.cpp"
 #include "yup_gui/yup_ListBox.cpp"
+#include "yup_gui/yup_PaintProfiler.cpp"
 #include "yup_gui/yup_PopupMenu.cpp"
 #include "yup_gui/yup_ProgressBar.cpp"
 #include "yup_gui/yup_ScrollBar.cpp"