feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Properly clear the trace client

Browse Source 
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 <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2017-09-13 11:28:57 +02:00
parent 08e3d8f011
commit 1e49ac3041
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -60,7 +60,7 @@ void QmlProfilerClientManager::setFlushInterval(quint32 flushInterval)
void QmlProfilerClientManager::clearBufferedData() void QmlProfilerClientManager::clearBufferedData()
{ {
if (m_clientPlugin) if (m_clientPlugin)
m_clientPlugin->clearData(); m_clientPlugin->clear();
} }
void QmlProfilerClientManager::stopRecording() void QmlProfilerClientManager::stopRecording()

4
src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
View File

@@ -198,10 +198,12 @@ QmlProfilerTraceClient::~QmlProfilerTraceClient()
delete d; delete d;
} }
void QmlProfilerTraceClient::clearData() void QmlProfilerTraceClient::clear()
{ {
d->serverTypeIds.clear();
d->eventTypeIds.clear(); d->eventTypeIds.clear();
d->rangesInProgress.clear(); d->rangesInProgress.clear();
d->pendingMessages.clear();
if (d->recordedFeatures != 0) { if (d->recordedFeatures != 0) {
d->recordedFeatures = 0; d->recordedFeatures = 0;
emit recordedFeaturesChanged(0); emit recordedFeaturesChanged(0);

2
src/plugins/qmlprofiler/qmlprofilertraceclient.h
View File

@@ -55,7 +55,7 @@ public:
virtual void messageReceived(const QByteArray &) override; virtual void messageReceived(const QByteArray &) override;
virtual void stateChanged(State status) override; virtual void stateChanged(State status) override;
void clearData(); void clear();
void sendRecordingStatus(int engineId = -1); void sendRecordingStatus(int engineId = -1);
void setRequestedFeatures(quint64 features); void setRequestedFeatures(quint64 features);
void setFlushInterval(quint32 flushInterval); void setFlushInterval(quint32 flushInterval);