1 files changed, 21 insertions, 45 deletions

diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 28b058c2e8..377c9831d7 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QQUICKPROFILER_P_H
 #define QQUICKPROFILER_P_H
@@ -58,6 +22,7 @@
 #include <QtQml/private/qqmlprofilerdefinitions_p.h>
 #endif
 
+#include <QtCore/private/qnumeric_p.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qmutex.h>
@@ -146,7 +111,7 @@ struct Q_AUTOTEST_EXPORT QQuickProfilerData
     };
 };
 
-Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_RELOCATABLE_TYPE);
 
 class QQuickProfilerSceneGraphData : public QQmlProfilerDefinitions {
 private:
@@ -164,14 +129,14 @@ public:
     template<SceneGraphFrameType type>
     qint64 *timings()
     {
-        if (type < NumRenderThreadFrameTypes)
+        if constexpr (type < NumRenderThreadFrameTypes)
             return renderThreadTimings.localData().values[type];
         else
             return guiThreadTimings.values[type - NumRenderThreadFrameTypes];
     }
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickProfiler : public QObject, public QQmlProfilerDefinitions {
+class Q_QUICK_EXPORT QQuickProfiler : public QObject, public QQmlProfilerDefinitions {
     Q_OBJECT
 public:
 
@@ -242,11 +207,12 @@ public:
 
     static void animationFrame(qint64 delta, AnimationThread threadId)
     {
-        int animCount = QUnifiedTimer::instance()->runningAnimationCount();
+        const qsizetype animCount = QUnifiedTimer::instance()->runningAnimationCount();
 
         if (animCount > 0 && delta > 0) {
             s_instance->processMessage(QQuickProfilerData(s_instance->timestamp(), 1 << Event,
-                    1 << AnimationFrame, 1000 / (int)delta /* trim fps to integer */, animCount,
+                    1 << AnimationFrame, 1000 / (int)delta /* trim fps to integer */,
+                    qt_saturate<int>(animCount),
                     threadId));
         }
     }
@@ -335,7 +301,7 @@ public:
 
     ~QQuickProfiler() override;
 
-signals:
+Q_SIGNALS:
     void dataReady(const QVector<QQuickProfilerData> &data);
 
 protected:
@@ -352,7 +318,17 @@ protected:
     void processMessage(const QQuickProfilerData &message)
     {
         QMutexLocker lock(&m_dataMutex);
-        m_data.append(message);
+        if (Q_LIKELY(m_data.isEmpty() || m_data.last().time <= message.time)) {
+            m_data.append(message);
+            return;
+        }
+
+        // Since the scenegraph data is recorded from different threads, contention for the lock
+        // can cause it to be processed out of order here. Insert the message at the right place.
+        const auto it = std::find_if(
+                m_data.rbegin(), m_data.rend(),
+                [t = message.time](const QQuickProfilerData &i) { return i.time <= t; });
+        m_data.insert(it.base(), message);
     }
 
     void startProfilingImpl(quint64 features);