Use better QmlProfiler client from Qt Creator

This client can track locations itself, and thus doesn't require the
server to send the event types over and over with each message. Once all
our client implementations have this feature we can drop a lot of code.

Furthermore, this way we can write regression tests for bugs that only
occur when client side location tracking is active.

Change-Id: I3735392452e20a7be98e92b900fadef04701d85f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 27 insertions, 35 deletions

diff --git a/src/qmldebug/qqmlprofilerclient_p.h b/src/qmldebug/qqmlprofilerclient_p.h
index a328cad26c..68a32a1a5a 100644
--- a/src/qmldebug/qqmlprofilerclient_p.h
+++ b/src/qmldebug/qqmlprofilerclient_p.h
@@ -41,7 +41,9 @@
 #define QQMLPROFILERCLIENT_P_H
 
 #include "qqmldebugclient_p.h"
-#include "qqmleventlocation_p.h"
+#include "qqmlprofilereventlocation_p.h"
+#include "qqmlprofilereventreceiver_p.h"
+
 #include <private/qqmlprofilerdefinitions_p.h>
 #include <private/qpacket_p.h>
 
@@ -59,52 +61,42 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlProfilerClientPrivate;
-class QQmlProfilerClient : public QQmlDebugClient
+class QQmlProfilerClient : public QQmlDebugClient, public QQmlProfilerDefinitions
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQmlProfilerClient)
+    Q_PROPERTY(bool recording READ isRecording WRITE setRecording NOTIFY recordingChanged)
 
 public:
-    QQmlProfilerClient(QQmlDebugConnection *connection);
-    void setFeatures(quint64 features);
-    void sendRecordingStatus(bool record, int engineId = -1, quint32 flushInterval = 0);
-
-protected:
-    QQmlProfilerClient(QQmlProfilerClientPrivate &dd);
-
-private:
-    void messageReceived(const QByteArray &message) override;
+    QQmlProfilerClient(QQmlDebugConnection *connection, QQmlProfilerEventReceiver *eventReceiver,
+                       quint64 features = std::numeric_limits<quint64>::max());
+    ~QQmlProfilerClient();
 
-    virtual void traceStarted(qint64 time, int engineId);
-    virtual void traceFinished(qint64 time, int engineId);
+    bool isRecording() const;
+    void setRecording(bool);
+    quint64 recordedFeatures() const;
+    virtual void messageReceived(const QByteArray &) override;
+    virtual void stateChanged(State status) override;
 
-    virtual void rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime);
-    virtual void rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time,
-                           const QString &data);
-    virtual void rangeLocation(QQmlProfilerDefinitions::RangeType type, qint64 time,
-                               const QQmlEventLocation &location);
-    virtual void rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime);
+    void clearEvents();
+    void clearAll();
 
-    virtual void animationFrame(qint64 time, int frameRate, int animationCount, int threadId);
+    void sendRecordingStatus(int engineId = -1);
+    void setRequestedFeatures(quint64 features);
+    void setFlushInterval(quint32 flushInterval);
 
-    virtual void sceneGraphEvent(QQmlProfilerDefinitions::SceneGraphFrameType type, qint64 time,
-                                 qint64 numericData1, qint64 numericData2, qint64 numericData3,
-                                 qint64 numericData4, qint64 numericData5);
-
-    virtual void pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEventType type, qint64 time,
-                                  const QString &url, int numericData1, int numericData2);
-
-    virtual void memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time,
-                                  qint64 amount);
+protected:
+    QQmlProfilerClient(QQmlProfilerClientPrivate &dd);
 
-    virtual void inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time, int a,
-                            int b);
+signals:
+    void complete(qint64 maximumTime);
+    void traceFinished(qint64 timestamp, const QList<int> &engineIds);
+    void traceStarted(qint64 timestamp, const QList<int> &engineIds);
 
-    virtual void complete();
+    void recordingChanged(bool arg);
+    void recordedFeaturesChanged(quint64 features);
 
-    virtual void unknownEvent(QQmlProfilerDefinitions::Message messageType, qint64 time,
-                              int detailType);
-    virtual void unknownData(QPacket &stream);
+    void cleared();
 };
 
 QT_END_NAMESPACE