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

QmlProfiler: allow for multiple sequential traces to be aggregated

Browse Source 
Task-number: QTCREATORBUG-13317
Change-Id: Ic7d1d5c94d8d522741b6c4207a21a43f521da5fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-18 12:34:52 +01:00
parent 030acfdf73
commit ffc11d5e9e
9 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ public:
quint64 tcpPort;
QString sysroot;
quint32 flushInterval;
bool aggregateTraces;
QmlProfilerModelManager *modelManager;
};
@@ -77,6 +78,7 @@ QmlProfilerClientManager::QmlProfilerClientManager(QObject *parent) :
d->connection = 0;
d->connectionAttempts = 0;
d->flushInterval = 0;
d->aggregateTraces = true;
d->modelManager = 0;
@@ -101,6 +103,16 @@ void QmlProfilerClientManager::setFlushInterval(quint32 flushInterval)
d->flushInterval = flushInterval;
}
bool QmlProfilerClientManager::aggregateTraces() const
{
return d->aggregateTraces;
}
void QmlProfilerClientManager::setAggregateTraces(bool aggregateTraces)
{
d->aggregateTraces = aggregateTraces;
}
void QmlProfilerClientManager::setTcpConnection(QString host, quint64 port)
{
d->tcpHost = host;
@@ -349,7 +361,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
void QmlProfilerClientManager::qmlComplete(qint64 maximumTime)
{
d->modelManager->traceTime()->increaseEndTime(maximumTime);
if (d->modelManager)
if (d->modelManager && !d->aggregateTraces)
d->modelManager->acquiringDone();
}