QmlDebug: move QQuickProfiler into a plugin

This saves some code in QtQuick and allows us to split up QPacket into
different versions for client and server.

Change-Id: I9b8c723274fb11d6321c5002910148b193aa6b40
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

15 files changed, 428 insertions, 138 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 49c719f036..8da6854289 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -38,8 +38,9 @@
 QT_BEGIN_NAMESPACE
 
 QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine) :
-    QQmlAbstractProfilerAdapter(service), next(0)
+    next(0)
 {
+    setService(service);
     engine->enableProfiler();
     connect(this, SIGNAL(profilingEnabled(quint64)), engine->profiler, SLOT(startProfiling(quint64)));
     connect(this, SIGNAL(profilingEnabledWhileWaiting(quint64)),
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index 0cf2fa0246..77503c5f06 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -37,6 +37,7 @@
 #include "qqmlprofilerservicefactory.h"
 #include <private/qqmlengine_p.h>
 #include <private/qpacket_p.h>
+#include <private/qqmldebugpluginmanager_p.h>
 
 #include <QtCore/qdatastream.h>
 #include <QtCore/qurl.h>
@@ -46,11 +47,20 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_QML_DEBUG_PLUGIN_LOADER(QQmlAbstractProfilerAdapter)
+Q_QML_IMPORT_DEBUG_PLUGIN(QQuickProfilerAdapterFactory)
+
 QQmlProfilerServiceImpl::QQmlProfilerServiceImpl(QObject *parent) :
     QQmlConfigurableDebugService<QQmlProfilerService>(1, parent),
     m_waitingForStop(false)
 {
     m_timer.start();
+    QQmlAbstractProfilerAdapter *quickAdapter =
+            loadQQmlAbstractProfilerAdapter(QLatin1String("QQuickProfilerAdapter"));
+    if (quickAdapter) {
+        addGlobalProfiler(quickAdapter);
+        quickAdapter->setService(this);
+    }
 }
 
 QQmlProfilerServiceImpl::~QQmlProfilerServiceImpl()
@@ -177,7 +187,6 @@ void QQmlProfilerServiceImpl::removeGlobalProfiler(QQmlAbstractProfilerAdapter *
     QMutexLocker lock(&m_configMutex);
     removeProfilerFromStartTimes(profiler);
     m_globalProfilers.removeOne(profiler);
-    delete profiler;
 }
 
 void QQmlProfilerServiceImpl::removeProfilerFromStartTimes(const QQmlAbstractProfilerAdapter *profiler)
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp
index 991ef4b6ba..dd9e444748 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp
@@ -39,8 +39,9 @@
 QT_BEGIN_NAMESPACE
 
 QV4ProfilerAdapter::QV4ProfilerAdapter(QQmlProfilerService *service, QV4::ExecutionEngine *engine) :
-    QQmlAbstractProfilerAdapter(service), m_functionCallPos(0), m_memoryPos(0)
+    m_functionCallPos(0), m_memoryPos(0)
 {
+    setService(service);
     engine->enableProfiler();
     connect(this, SIGNAL(profilingEnabled(quint64)),
             this, SLOT(forwardEnabled(quint64)));
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro b/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro
new file mode 100644
index 0000000000..9cc51c5e70
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro
@@ -0,0 +1,19 @@
+TARGET = qmldbg_quickprofiler
+QT    += qml-private quick-private core-private
+
+PLUGIN_TYPE = qmltooling
+PLUGIN_CLASS_NAME = QQuickProfilerAdapterFactory
+load(qt_plugin)
+
+INCLUDEPATH += $$PWD/../shared
+
+SOURCES += \
+    $$PWD/qquickprofileradapter.cpp \
+    $$PWD/qquickprofileradapterfactory.cpp
+
+HEADERS += \
+    $$PWD/qquickprofileradapter.h \
+    $$PWD/qquickprofileradapterfactory.h
+
+OTHER_FILES += \
+    qquickprofileradapter.json
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
new file mode 100644
index 0000000000..053db9aa45
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickprofileradapter.h"
+#include <QCoreApplication>
+#include <private/qqmldebugserviceinterfaces_p.h>
+#include <private/qpacket_p.h>
+#include <private/qquickprofiler_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQuickProfilerAdapter::QQuickProfilerAdapter(QObject *parent) :
+    QQmlAbstractProfilerAdapter(parent), next(0)
+{
+    QQuickProfiler::initialize(this);
+
+    // We can always do DirectConnection here as all methods are protected by mutexes
+    connect(this, SIGNAL(profilingEnabled(quint64)),
+            QQuickProfiler::s_instance, SLOT(startProfilingImpl(quint64)), Qt::DirectConnection);
+    connect(this, SIGNAL(profilingEnabledWhileWaiting(quint64)),
+            QQuickProfiler::s_instance, SLOT(startProfilingImpl(quint64)), Qt::DirectConnection);
+    connect(this, SIGNAL(referenceTimeKnown(QElapsedTimer)),
+            QQuickProfiler::s_instance, SLOT(setTimer(QElapsedTimer)), Qt::DirectConnection);
+    connect(this, SIGNAL(profilingDisabled()),
+            QQuickProfiler::s_instance, SLOT(stopProfilingImpl()), Qt::DirectConnection);
+    connect(this, SIGNAL(profilingDisabledWhileWaiting()),
+            QQuickProfiler::s_instance, SLOT(stopProfilingImpl()), Qt::DirectConnection);
+    connect(this, SIGNAL(dataRequested()),
+            QQuickProfiler::s_instance, SLOT(reportDataImpl()), Qt::DirectConnection);
+    connect(QQuickProfiler::s_instance, SIGNAL(dataReady(QVector<QQuickProfilerData>)),
+            this, SLOT(receiveData(QVector<QQuickProfilerData>)), Qt::DirectConnection);
+}
+
+QQuickProfilerAdapter::~QQuickProfilerAdapter()
+{
+    if (service)
+        service->removeGlobalProfiler(this);
+}
+
+// convert to QByteArrays that can be sent to the debug client
+// use of QDataStream can skew results
+//     (see tst_qqmldebugtrace::trace() benchmark)
+static void qQuickProfilerDataToByteArrays(const QQuickProfilerData &data,
+                                           QList<QByteArray> &messages)
+{
+    Q_ASSERT_X(((data.messageType | data.detailType) & (1 << 31)) == 0, Q_FUNC_INFO,
+               "You can use at most 31 message types and 31 detail types.");
+    for (uint decodedMessageType = 0; (data.messageType >> decodedMessageType) != 0;
+         ++decodedMessageType) {
+        if ((data.messageType & (1 << decodedMessageType)) == 0)
+            continue;
+
+        for (uint decodedDetailType = 0; (data.detailType >> decodedDetailType) != 0;
+             ++decodedDetailType) {
+            if ((data.detailType & (1 << decodedDetailType)) == 0)
+                continue;
+
+            //### using QDataStream is relatively expensive
+            QPacket ds;
+            ds << data.time << decodedMessageType << decodedDetailType;
+
+            switch (decodedMessageType) {
+            case QQuickProfiler::Event:
+                switch (decodedDetailType) {
+                case QQuickProfiler::AnimationFrame:
+                    ds << data.framerate << data.count << data.threadId;
+                    break;
+                case QQuickProfiler::Key:
+                case QQuickProfiler::Mouse:
+                    ds << data.inputType << data.inputA << data.inputB;
+                    break;
+                }
+                break;
+            case QQuickProfiler::PixmapCacheEvent:
+                ds << data.detailUrl.toString();
+                switch (decodedDetailType) {
+                    case QQuickProfiler::PixmapSizeKnown: ds << data.x << data.y; break;
+                    case QQuickProfiler::PixmapReferenceCountChanged: ds << data.count; break;
+                    case QQuickProfiler::PixmapCacheCountChanged: ds << data.count; break;
+                    default: break;
+                }
+                break;
+            case QQuickProfiler::SceneGraphFrame:
+                switch (decodedDetailType) {
+                    // RendererFrame: preprocessTime, updateTime, bindingTime, renderTime
+                    case QQuickProfiler::SceneGraphRendererFrame: ds << data.subtime_1 << data.subtime_2 << data.subtime_3 << data.subtime_4; break;
+                    // AdaptationLayerFrame: glyphCount (which is an integer), glyphRenderTime, glyphStoreTime
+                    case QQuickProfiler::SceneGraphAdaptationLayerFrame: ds << data.subtime_3 << data.subtime_1 << data.subtime_2; break;
+                    // ContextFrame: compiling material time
+                    case QQuickProfiler::SceneGraphContextFrame: ds << data.subtime_1; break;
+                    // RenderLoop: syncTime, renderTime, swapTime
+                    case QQuickProfiler::SceneGraphRenderLoopFrame: ds << data.subtime_1 << data.subtime_2 << data.subtime_3; break;
+                    // TexturePrepare: bind, convert, swizzle, upload, mipmap
+                    case QQuickProfiler::SceneGraphTexturePrepare: ds << data.subtime_1 << data.subtime_2 << data.subtime_3 << data.subtime_4 << data.subtime_5; break;
+                    // TextureDeletion: deletionTime
+                    case QQuickProfiler::SceneGraphTextureDeletion: ds << data.subtime_1; break;
+                    // PolishAndSync: polishTime, waitTime, syncTime, animationsTime,
+                    case QQuickProfiler::SceneGraphPolishAndSync: ds << data.subtime_1 << data.subtime_2 << data.subtime_3 << data.subtime_4; break;
+                    // WindowsRenderLoop: GL time, make current time, SceneGraph time
+                    case QQuickProfiler::SceneGraphWindowsRenderShow: ds << data.subtime_1 << data.subtime_2 << data.subtime_3; break;
+                    // WindowsAnimations: update time
+                    case QQuickProfiler::SceneGraphWindowsAnimations: ds << data.subtime_1; break;
+                    // non-threaded rendering: polish time
+                    case QQuickProfiler::SceneGraphPolishFrame: ds << data.subtime_1; break;
+                    default:break;
+                }
+                break;
+            default:
+                Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message type.");
+                break;
+            }
+            messages << ds.data();
+        }
+    }
+}
+
+qint64 QQuickProfilerAdapter::sendMessages(qint64 until, QList<QByteArray> &messages)
+{
+    while (next < m_data.size()) {
+        if (m_data[next].time <= until)
+            qQuickProfilerDataToByteArrays(m_data[next++], messages);
+        else
+            return m_data[next].time;
+    }
+    m_data.clear();
+    next = 0;
+    return -1;
+}
+
+void QQuickProfilerAdapter::receiveData(const QVector<QQuickProfilerData> &new_data)
+{
+    if (m_data.isEmpty())
+        m_data = new_data;
+    else
+        m_data.append(new_data);
+    service->dataReady(this);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h
new file mode 100644
index 0000000000..7a3a25f049
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKPROFILERADAPTER_H
+#define QQUICKPROFILERADAPTER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQml/private/qqmlabstractprofileradapter_p.h>
+#include <QtQuick/private/qquickprofiler_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickProfilerAdapter : public QQmlAbstractProfilerAdapter {
+    Q_OBJECT
+public:
+    QQuickProfilerAdapter(QObject *parent = 0);
+    ~QQuickProfilerAdapter();
+    qint64 sendMessages(qint64 until, QList<QByteArray> &messages);
+
+public slots:
+    void receiveData(const QVector<QQuickProfilerData> &new_data);
+
+private:
+    int next;
+    QVector<QQuickProfilerData> m_data;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKPROFILERADAPTER_H
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.json b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.json
new file mode 100644
index 0000000000..76b08fbcab
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "QQuickProfilerAdapter" ]
+}
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp
new file mode 100644
index 0000000000..9fae5e3a4d
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickprofileradapterfactory.h"
+#include "qquickprofileradapter.h"
+#include <private/qqmldebugconnector_p.h>
+#include <private/qqmldebugserviceinterfaces_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlAbstractProfilerAdapter *QQuickProfilerAdapterFactory::create(const QString &key)
+{
+    if (key != QLatin1String("QQuickProfilerAdapter"))
+        return 0;
+    return new QQuickProfilerAdapter(this);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.h b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.h
new file mode 100644
index 0000000000..dee77747ef
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKPROFILERADAPTERFACTORY_H
+#define QQUICKPROFILERADAPTERFACTORY_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQml/private/qqmlabstractprofileradapter_p.h>
+#include <QtQuick/private/qquickprofiler_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickProfilerAdapterFactory : public QQmlAbstractProfilerAdapterFactory
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlAbstractProfilerAdapterFactory_iid FILE "qquickprofileradapter.json")
+public:
+    QQmlAbstractProfilerAdapter *create(const QString &key);
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKPROFILERADAPTERFACTORY_H
diff --git a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro b/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
index 7347a7598f..b419f9ca3e 100644
--- a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
+++ b/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
@@ -6,7 +6,7 @@ PLUGIN_CLASS_NAME = QQmlDebugServerFactory
 load(qt_plugin)
 
 SOURCES += \
-    $$PWD/qqmldebugserver.cpp \
+    $$PWD/qqmldebugserver.cpp
 
 HEADERS += \
     $$PWD/qqmldebugserverfactory.h \
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 5b39747674..9345e46cf7 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -15,4 +15,6 @@ SUBDIRS += \
 
 qmldbg_server.depends = packetprotocol
 
-qtHaveModule(quick): SUBDIRS += qmldbg_inspector
+qtHaveModule(quick): SUBDIRS += \
+    qmldbg_inspector \
+    qmldbg_quickprofiler
diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h
index bfd1561d3d..c723224985 100644
--- a/src/qml/debugger/qqmlabstractprofileradapter_p.h
+++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h
@@ -58,9 +58,10 @@ class Q_QML_PRIVATE_EXPORT QQmlAbstractProfilerAdapter : public QObject, public
     Q_OBJECT
 
 public:
-    QQmlAbstractProfilerAdapter(QQmlProfilerService *service) :
-        service(service), waiting(true), featuresEnabled(0) {}
+    QQmlAbstractProfilerAdapter(QObject *parent = 0) :
+        QObject(parent), service(0), waiting(true), featuresEnabled(0) {}
     virtual ~QQmlAbstractProfilerAdapter() {}
+    void setService(QQmlProfilerService *new_service) { service = new_service; }
 
     virtual qint64 sendMessages(qint64 until, QList<QByteArray> &messages) = 0;
 
@@ -96,6 +97,15 @@ private:
     quint64 featuresEnabled;
 };
 
+class Q_QML_PRIVATE_EXPORT QQmlAbstractProfilerAdapterFactory : public QObject
+{
+    Q_OBJECT
+public:
+    virtual QQmlAbstractProfilerAdapter *create(const QString &key) = 0;
+};
+
+#define QQmlAbstractProfilerAdapterFactory_iid "org.qt-project.Qt.QQmlAbstractProfilerAdapterFactory"
+
 QT_END_NAMESPACE
 
 #endif // QQMLABSTRACTPROFILERADAPTER_P_H
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index ecf6865895..cabf0589e2 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -190,10 +190,6 @@ void QQmlQtQuick2Module::defineModule()
     QQmlEngineDebugService *debugService = QQmlDebugConnector::service<QQmlEngineDebugService>();
     if (debugService)
         debugService->setStatesDelegate(new QQmlQtQuick2DebugStatesDelegate);
-
-    QQmlProfilerService *profilerService = QQmlDebugConnector::service<QQmlProfilerService>();
-    if (profilerService)
-        QQuickProfiler::initialize(profilerService);
 }
 
 void QQmlQtQuick2Module::undefineModule()
diff --git a/src/quick/util/qquickprofiler.cpp b/src/quick/util/qquickprofiler.cpp
index 5ed1ff05af..cb6212196e 100644
--- a/src/quick/util/qquickprofiler.cpp
+++ b/src/quick/util/qquickprofiler.cpp
@@ -32,9 +32,11 @@
 ****************************************************************************/
 
 #include "qquickprofiler_p.h"
-#include <QCoreApplication>
-#include <private/qqmldebugserviceinterfaces_p.h>
-#include <private/qpacket_p.h>
+
+#include <QtQml/private/qqmlabstractprofileradapter_p.h>
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qthread.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -42,98 +44,10 @@ QT_BEGIN_NAMESPACE
 QQuickProfiler *QQuickProfiler::s_instance = 0;
 quint64 QQuickProfiler::featuresEnabled = 0;
 
-// convert to QByteArrays that can be sent to the debug client
-// use of QDataStream can skew results
-//     (see tst_qqmldebugtrace::trace() benchmark)
-void QQuickProfilerData::toByteArrays(QList<QByteArray> &messages) const
-{
-    Q_ASSERT_X(((messageType | detailType) & (1 << 31)) == 0, Q_FUNC_INFO, "You can use at most 31 message types and 31 detail types.");
-    for (uint decodedMessageType = 0; (messageType >> decodedMessageType) != 0; ++decodedMessageType) {
-        if ((messageType & (1 << decodedMessageType)) == 0)
-            continue;
-
-        for (uint decodedDetailType = 0; (detailType >> decodedDetailType) != 0; ++decodedDetailType) {
-            if ((detailType & (1 << decodedDetailType)) == 0)
-                continue;
-
-            //### using QDataStream is relatively expensive
-            QPacket ds;
-            ds << time << decodedMessageType << decodedDetailType;
-
-            switch (decodedMessageType) {
-            case QQuickProfiler::Event:
-                switch (decodedDetailType) {
-                case QQuickProfiler::AnimationFrame:
-                    ds << framerate << count << threadId;
-                    break;
-                case QQuickProfiler::Key:
-                case QQuickProfiler::Mouse:
-                    ds << inputType << inputA << inputB;
-                    break;
-                }
-                break;
-            case QQuickProfiler::PixmapCacheEvent:
-                ds << detailUrl.toString();
-                switch (decodedDetailType) {
-                    case QQuickProfiler::PixmapSizeKnown: ds << x << y; break;
-                    case QQuickProfiler::PixmapReferenceCountChanged: ds << count; break;
-                    case QQuickProfiler::PixmapCacheCountChanged: ds << count; break;
-                    default: break;
-                }
-                break;
-            case QQuickProfiler::SceneGraphFrame:
-                switch (decodedDetailType) {
-                    // RendererFrame: preprocessTime, updateTime, bindingTime, renderTime
-                    case QQuickProfiler::SceneGraphRendererFrame: ds << subtime_1 << subtime_2 << subtime_3 << subtime_4; break;
-                    // AdaptationLayerFrame: glyphCount (which is an integer), glyphRenderTime, glyphStoreTime
-                    case QQuickProfiler::SceneGraphAdaptationLayerFrame: ds << subtime_3 << subtime_1 << subtime_2; break;
-                    // ContextFrame: compiling material time
-                    case QQuickProfiler::SceneGraphContextFrame: ds << subtime_1; break;
-                    // RenderLoop: syncTime, renderTime, swapTime
-                    case QQuickProfiler::SceneGraphRenderLoopFrame: ds << subtime_1 << subtime_2 << subtime_3; break;
-                    // TexturePrepare: bind, convert, swizzle, upload, mipmap
-                    case QQuickProfiler::SceneGraphTexturePrepare: ds << subtime_1 << subtime_2 << subtime_3 << subtime_4 << subtime_5; break;
-                    // TextureDeletion: deletionTime
-                    case QQuickProfiler::SceneGraphTextureDeletion: ds << subtime_1; break;
-                    // PolishAndSync: polishTime, waitTime, syncTime, animationsTime,
-                    case QQuickProfiler::SceneGraphPolishAndSync: ds << subtime_1 << subtime_2 << subtime_3 << subtime_4; break;
-                    // WindowsRenderLoop: GL time, make current time, SceneGraph time
-                    case QQuickProfiler::SceneGraphWindowsRenderShow: ds << subtime_1 << subtime_2 << subtime_3; break;
-                    // WindowsAnimations: update time
-                    case QQuickProfiler::SceneGraphWindowsAnimations: ds << subtime_1; break;
-                    // non-threaded rendering: polish time
-                    case QQuickProfiler::SceneGraphPolishFrame: ds << subtime_1; break;
-                    default:break;
-                }
-                break;
-            default:
-                Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message type.");
-                break;
-            }
-            messages << ds.data();
-        }
-    }
-}
-
-qint64 QQuickProfiler::sendMessages(qint64 until, QList<QByteArray> &messages)
-{
-    QMutexLocker lock(&m_dataMutex);
-    while (next < m_data.size()) {
-        if (m_data[next].time <= until)
-            m_data[next++].toByteArrays(messages);
-        else
-            return m_data[next].time;
-    }
-    m_data.clear();
-    next = 0;
-    return -1;
-}
-
-void QQuickProfiler::initialize(QQmlProfilerService *service)
+void QQuickProfiler::initialize(QObject *parent)
 {
     Q_ASSERT(s_instance == 0);
-    s_instance = new QQuickProfiler(service);
-    service->addGlobalProfiler(s_instance);
+    s_instance = new QQuickProfiler(parent);
 }
 
 void animationTimerCallback(qint64 delta)
@@ -160,26 +74,10 @@ public slots:
 
 #include "qquickprofiler.moc"
 
-QQuickProfiler::QQuickProfiler(QQmlProfilerService *service) :
-    QQmlAbstractProfilerAdapter(service), next(0)
+QQuickProfiler::QQuickProfiler(QObject *parent) : QObject(parent)
 {
     // This is safe because at this point the m_instance isn't initialized, yet.
     m_timer.start();
-
-    // We can always do DirectConnection here as all methods are protected by mutexes
-    connect(this, SIGNAL(profilingEnabled(quint64)), this, SLOT(startProfilingImpl(quint64)),
-            Qt::DirectConnection);
-    connect(this, SIGNAL(profilingEnabledWhileWaiting(quint64)),
-            this, SLOT(startProfilingImpl(quint64)), Qt::DirectConnection);
-    connect(this, SIGNAL(referenceTimeKnown(QElapsedTimer)), this, SLOT(setTimer(QElapsedTimer)),
-            Qt::DirectConnection);
-    connect(this, SIGNAL(profilingDisabled()), this, SLOT(stopProfilingImpl()),
-            Qt::DirectConnection);
-    connect(this, SIGNAL(profilingDisabledWhileWaiting()), this, SLOT(stopProfilingImpl()),
-            Qt::DirectConnection);
-    connect(this, SIGNAL(dataRequested()), this, SLOT(reportDataImpl()),
-            Qt::DirectConnection);
-
     CallbackRegistrationHelper *helper = new CallbackRegistrationHelper; // will delete itself
     helper->moveToThread(QCoreApplication::instance()->thread());
     QMetaObject::invokeMethod(helper, "registerAnimationTimerCallback", Qt::QueuedConnection);
@@ -195,7 +93,6 @@ QQuickProfiler::~QQuickProfiler()
 void QQuickProfiler::startProfilingImpl(quint64 features)
 {
     QMutexLocker lock(&m_dataMutex);
-    next = 0;
     m_data.clear();
     featuresEnabled = features;
 }
@@ -206,12 +103,12 @@ void QQuickProfiler::stopProfilingImpl()
         QMutexLocker lock(&m_dataMutex);
         featuresEnabled = 0;
     }
-    service->dataReady(this);
+    emit dataReady(m_data);
 }
 
 void QQuickProfiler::reportDataImpl()
 {
-    service->dataReady(this);
+    emit dataReady(m_data);
 }
 
 void QQuickProfiler::setTimer(const QElapsedTimer &t)
diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 78216acc7d..4983adf63b 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -45,13 +45,14 @@
 // We mean it.
 //
 
-#include <private/qtquickglobal_p.h>
 #include <QtCore/private/qabstractanimation_p.h>
-#include <QtQml/private/qqmlabstractprofileradapter_p.h>
-#include <QUrl>
-#include <QSize>
-#include <QMutex>
-#include <QThreadStorage>
+#include <QtQml/private/qqmlprofilerdefinitions_p.h>
+#include <QtQuick/private/qtquickglobal_p.h>
+
+#include <QtCore/qurl.h>
+#include <QtCore/qsize.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qthreadstorage.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -164,8 +165,6 @@ struct Q_AUTOTEST_EXPORT QQuickProfilerData
         int threadId;
         int inputB;         //used by input events
     };
-
-    void toByteArrays(QList<QByteArray> &messages) const;
 };
 
 Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_MOVABLE_TYPE);
@@ -203,7 +202,7 @@ public:
     }
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickProfiler : public QQmlAbstractProfilerAdapter {
+class Q_QUICK_PRIVATE_EXPORT QQuickProfiler : public QObject, public QQmlProfilerDefinitions {
     Q_OBJECT
 public:
 
@@ -314,7 +313,6 @@ public:
 
     qint64 timestamp() { return m_timer.nsecsElapsed(); }
 
-    qint64 sendMessages(qint64 until, QList<QByteArray> &messages);
 
     static quint64 featuresEnabled;
     static bool profilingSceneGraph()
@@ -322,19 +320,20 @@ public:
         return featuresEnabled & (1 << QQuickProfiler::ProfileSceneGraph);
     }
 
-    static void initialize(QQmlProfilerService *service);
+    static void initialize(QObject *parent);
 
     virtual ~QQuickProfiler();
 
 protected:
-    int next;
+    friend class QQuickProfilerAdapter;
+
     static QQuickProfiler *s_instance;
     QMutex m_dataMutex;
     QElapsedTimer m_timer;
-    QVarLengthArray<QQuickProfilerData> m_data;
+    QVector<QQuickProfilerData> m_data;
     QQuickProfilerSceneGraphData m_sceneGraphData;
 
-    QQuickProfiler(QQmlProfilerService *service);
+    QQuickProfiler(QObject *parent);
 
     void processMessage(const QQuickProfilerData &message)
     {
@@ -342,6 +341,9 @@ protected:
         m_data.append(message);
     }
 
+signals:
+    void dataReady(const QVector<QQuickProfilerData> &data);
+
 protected slots:
     void startProfilingImpl(quint64 features);
     void stopProfilingImpl();