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

QmlProfiler: Guess the trace end time if we don't receive EndTrace

Browse Source 
Task-number: QTCREATORBUG-11952
Change-Id: Ie55b616a1fc54e0cccac5560ec66fb7cc496c8e2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Ulf Hermann
2014-04-03 12:33:14 +02:00
parent d8adc10fbe
commit 12f5bbcceb
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmldebug/qmlprofilertraceclient.cpp
View File

@@ -186,7 +186,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
d->maximumTime = qMax(time, d->maximumTime);
}
} else if (messageType == Complete) {
emit complete();
emit complete(d->maximumTime);
} else if (messageType == SceneGraphFrame) {
int sgEventType;
int count = 0;

2
src/libs/qmldebug/qmlprofilertraceclient.h
View File

@@ -97,7 +97,7 @@ public slots:
void sendRecordingStatus();
signals:
void complete();
void complete(qint64 maximumTime);
void gap(qint64 time);
void event(int event, qint64 time);
void traceFinished( qint64 time );

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

@@ -172,8 +172,8 @@ void QmlProfilerClientManager::connectClientSignals()
{
QTC_ASSERT(d->profilerState, return);
if (d->qmlclientplugin) {
connect(d->qmlclientplugin.data(), SIGNAL(complete()),
this, SLOT(qmlComplete()));
connect(d->qmlclientplugin.data(), SIGNAL(complete(qint64)),
this, SLOT(qmlComplete(qint64)));
connect(d->qmlclientplugin.data(),
SIGNAL(rangedEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation,
qint64,qint64,qint64,qint64,qint64)),
@@ -354,8 +354,10 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
}
}
void QmlProfilerClientManager::qmlComplete()
void QmlProfilerClientManager::qmlComplete(qint64 maximumTime)
{
if (maximumTime > d->modelManager->traceTime()->endTime())
d->modelManager->traceTime()->setEndTime(maximumTime);
d->qmlDataReady = true;
if (!d->v8clientplugin || d->v8clientplugin.data()->status() != QmlDebug::Enabled || d->v8DataReady) {
emit dataReadyForProcessing();

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

@@ -72,7 +72,7 @@ private slots:
void connectionStateChanged();
void retryMessageBoxFinished(int result);
void qmlComplete();
void qmlComplete(qint64 maximumTime);
void v8Complete();
void profilerStateChanged();