Use QQuickProfiler's own timer to sample events

Like that the timings are more accurate.

Task-number: QTBUG-39876
Change-Id: Ia6bdce9c8089417e88797ec3a98c8a3e367f73f2
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>

1 files changed, 113 insertions, 6 deletions

diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 3aba3430e4..6796fab912 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -51,6 +51,7 @@
 #include <QUrl>
 #include <QSize>
 #include <QMutex>
+#include <QThreadStorage>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,8 +64,30 @@ QT_BEGIN_NAMESPACE
 #define Q_QUICK_PROFILE(Method)\
     Q_QUICK_PROFILE_IF_ENABLED(QQuickProfiler::Method)
 
-#define Q_QUICK_SG_PROFILE(Type, Params)\
-    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::sceneGraphFrame<Type> Params))
+#define Q_QUICK_SG_PROFILE_START(Type)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::startSceneGraphFrame<Type>()))
+
+#define Q_QUICK_SG_PROFILE_RECORD(Type)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::recordSceneGraphTimestamp<Type>()))
+
+#define Q_QUICK_SG_PROFILE_SKIP(Type, Skip)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::skipSceneGraphTimestamps<Type, Skip>()))
+
+#define Q_QUICK_SG_PROFILE_START_SYNCHRONIZED(Type1, Type2)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::startSceneGraphFrame<Type1, Type2>()))
+
+#define Q_QUICK_SG_PROFILE_SWITCH(Type1, Type2) \
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::reportSceneGraphFrame<Type1, true, Type2>()))
+
+#define Q_QUICK_SG_PROFILE_REPORT(Type)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::reportSceneGraphFrame<Type, false>()))
+
+#define Q_QUICK_SG_PROFILE_END(Type)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::reportSceneGraphFrame<Type, true>()))
+
+#define Q_QUICK_SG_PROFILE_END_WITH_PAYLOAD(Type, Payload)\
+    Q_QUICK_PROFILE_IF_ENABLED((QQuickProfiler::reportSceneGraphFrame<Type, true>(Payload)))
+
 
 
 // This struct is somewhat dangerous to use:
@@ -133,6 +156,39 @@ struct Q_AUTOTEST_EXPORT QQuickProfilerData
 
 Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_MOVABLE_TYPE);
 
+class QQuickProfilerSceneGraphData : public QQmlProfilerDefinitions {
+private:
+    static const uint s_numSceneGraphTimings = 5;
+
+    template<uint size>
+    struct TimingData {
+        qint64 values[size][s_numSceneGraphTimings + 1];
+        int offsets[size];
+    };
+
+    QThreadStorage<TimingData<NumRenderThreadFrameTypes> > renderThreadTimings;
+    TimingData<NumGUIThreadFrameTypes> guiThreadTimings;
+
+public:
+    template<SceneGraphFrameType type>
+    qint64 *timings()
+    {
+        if (type < NumRenderThreadFrameTypes)
+            return renderThreadTimings.localData().values[type];
+        else
+            return guiThreadTimings.values[type - NumRenderThreadFrameTypes];
+    }
+
+    template<SceneGraphFrameType type>
+    int &offset()
+    {
+        if (type < NumRenderThreadFrameTypes)
+            return renderThreadTimings.localData().offsets[type];
+        else
+            return guiThreadTimings.offsets[type - NumRenderThreadFrameTypes];
+    }
+};
+
 class Q_QUICK_PRIVATE_EXPORT QQuickProfiler : public QQmlAbstractProfilerAdapter {
     Q_OBJECT
 public:
@@ -160,12 +216,62 @@ public:
         }
     }
 
+    template<SceneGraphFrameType FrameType1, SceneGraphFrameType FrameType2>
+    static void startSceneGraphFrame()
+    {
+        startSceneGraphFrame<FrameType1>();
+        s_instance->m_sceneGraphData.offset<FrameType2>() = 0;
+        s_instance->m_sceneGraphData.timings<FrameType2>()[0] =
+                s_instance->m_sceneGraphData.timings<FrameType1>()[0];
+    }
+
+    template<SceneGraphFrameType FrameType>
+    static void startSceneGraphFrame()
+    {
+        s_instance->m_sceneGraphData.offset<FrameType>() = 0;
+        s_instance->m_sceneGraphData.timings<FrameType>()[0] = s_instance->timestamp();
+    }
+
     template<SceneGraphFrameType FrameType>
-    static void sceneGraphFrame(qint64 value1, qint64 value2 = -1, qint64 value3 = -1,
-                                qint64 value4 = -1, qint64 value5 = -1)
+    static void recordSceneGraphTimestamp()
+    {
+        s_instance->m_sceneGraphData.timings<FrameType>()
+            [++s_instance->m_sceneGraphData.offset<FrameType>()] = s_instance->timestamp();
+    }
+
+    template<SceneGraphFrameType FrameType, uint Skip>
+    static void skipSceneGraphTimestamps()
+    {
+        qint64 *timings = s_instance->m_sceneGraphData.timings<FrameType>();
+        const qint64 last = timings[s_instance->m_sceneGraphData.offset<FrameType>()];
+        for (uint i = 0; i < Skip; ++i)
+            timings[++s_instance->m_sceneGraphData.offset<FrameType>()] = last;
+    }
+
+    template<SceneGraphFrameType FrameType, bool Record>
+    static void reportSceneGraphFrame(quint64 payload = -1)
+    {
+        qint64 *timings = s_instance->m_sceneGraphData.timings<FrameType>();
+        int &offset = s_instance->m_sceneGraphData.offset<FrameType>();
+        if (Record)
+            timings[++offset] = s_instance->timestamp();
+        s_instance->processMessage(QQuickProfilerData(
+                timings[offset], 1 << SceneGraphFrame, 1 << FrameType,
+                offset > 0 ? timings[1] - timings[0] : payload,
+                offset > 1 ? timings[2] - timings[1] : payload,
+                offset > 2 ? timings[3] - timings[2] : payload,
+                offset > 3 ? timings[4] - timings[3] : payload,
+                offset > 4 ? timings[5] - timings[4] : payload));
+    }
+
+    template<SceneGraphFrameType FrameType, bool Record, SceneGraphFrameType SwitchTo>
+    static void reportSceneGraphFrame(quint64 payload = -1)
     {
-        s_instance->processMessage(QQuickProfilerData(s_instance->timestamp(), 1 << SceneGraphFrame,
-                1 << FrameType, value1, value2, value3, value4, value5));
+        reportSceneGraphFrame<FrameType, Record>(payload);
+        s_instance->m_sceneGraphData.offset<SwitchTo>() = 0;
+        s_instance->m_sceneGraphData.timings<SwitchTo>()[0] =
+                s_instance->m_sceneGraphData.timings<FrameType>()
+                [s_instance->m_sceneGraphData.offset<FrameType>()];
     }
 
     template<PixmapEventType PixmapState>
@@ -208,6 +314,7 @@ protected:
     QMutex m_dataMutex;
     QElapsedTimer m_timer;
     QVarLengthArray<QQuickProfilerData> m_data;
+    QQuickProfilerSceneGraphData m_sceneGraphData;
 
     QQuickProfiler(QQmlProfilerService *service);