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

QmlProfiler: Make sure we can handle inconsistent trace data

Browse Source 
Apparently some versions of Qt can produce traces with unmatched start
and end events. We should not crash on those.

Change-Id: Idfb3273f02470156e9f1863c43477d0c3494e0d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2016-12-12 16:51:25 +01:00
parent 2c98573e70
commit 071b1551b3
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
View File

@@ -72,13 +72,26 @@ void QmlProfilerRangeModel::loadEvent(const QmlEvent &event, const QmlEventType
m_stack.append(index); m_stack.append(index);
m_data.insert(index, QmlRangeEventStartInstance()); m_data.insert(index, QmlRangeEventStartInstance());
} else if (event.rangeStage() == RangeEnd) { } else if (event.rangeStage() == RangeEnd) {
int index = m_stack.pop(); if (!m_stack.isEmpty()) {
insertEnd(index, event.timestamp() - startTime(index)); int index = m_stack.pop();
insertEnd(index, event.timestamp() - startTime(index));
} else {
qWarning() << "Received inconsistent trace data from application.";
}
} }
} }
void QmlProfilerRangeModel::finalize() void QmlProfilerRangeModel::finalize()
{ {
if (!m_stack.isEmpty()) {
qWarning() << "End times for some events are missing.";
const qint64 endTime = modelManager()->traceTime()->endTime();
do {
int index = m_stack.pop();
insertEnd(index, endTime - startTime(index));
} while (!m_stack.isEmpty());
}
// compute range nesting // compute range nesting
computeNesting(); computeNesting();