From 1e49ac304179571c7f1c6f48641fd4c218919672 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 13 Sep 2017 11:28:57 +0200 Subject: [PATCH] QmlProfiler: Properly clear the trace client Rename the method to clear() and make sure all the event types and pending events are actually cleared. Change-Id: Ie6c916d374a00025f7d77d21345d039fe8cead80 Reviewed-by: Christian Kandeler --- src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilertraceclient.cpp | 4 +++- src/plugins/qmlprofiler/qmlprofilertraceclient.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index 1672e3d970d..43e54dda238 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -60,7 +60,7 @@ void QmlProfilerClientManager::setFlushInterval(quint32 flushInterval) void QmlProfilerClientManager::clearBufferedData() { if (m_clientPlugin) - m_clientPlugin->clearData(); + m_clientPlugin->clear(); } void QmlProfilerClientManager::stopRecording() diff --git a/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp b/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp index 39cdb96ede0..2bacfcb1a24 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp @@ -198,10 +198,12 @@ QmlProfilerTraceClient::~QmlProfilerTraceClient() delete d; } -void QmlProfilerTraceClient::clearData() +void QmlProfilerTraceClient::clear() { + d->serverTypeIds.clear(); d->eventTypeIds.clear(); d->rangesInProgress.clear(); + d->pendingMessages.clear(); if (d->recordedFeatures != 0) { d->recordedFeatures = 0; emit recordedFeaturesChanged(0); diff --git a/src/plugins/qmlprofiler/qmlprofilertraceclient.h b/src/plugins/qmlprofiler/qmlprofilertraceclient.h index b0f17c97893..b71324e21e9 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceclient.h +++ b/src/plugins/qmlprofiler/qmlprofilertraceclient.h @@ -55,7 +55,7 @@ public: virtual void messageReceived(const QByteArray &) override; virtual void stateChanged(State status) override; - void clearData(); + void clear(); void sendRecordingStatus(int engineId = -1); void setRequestedFeatures(quint64 features); void setFlushInterval(quint32 flushInterval);