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

QmlProfiler: Guard against the temporary trace file going away

Browse Source 
If we cannot open a temporary file to cache a trace or retrieve a
previously cached trace, the QML profiler won't work correctly. Show
an error in this case.

Change-Id: I468d74d9c33033b9ad19501bccbd69a9fe164fed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2017-02-20 19:19:50 +01:00
parent 1ee8d0fb64
commit bf69eb9467
5 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmlprofiler/qmlprofilertracefile.cpp
View File

@@ -668,8 +668,9 @@ void QmlProfilerFileWriter::saveQtd(QIODevice *device)
stream.writeStartElement(_("profilerDataModel"));
QStack<QmlEvent> stack;
m_model->replayEvents(-1, -1, [this, &stack, &stream](const QmlEvent &event,
const QmlEventType &type) {
const bool success = m_model->replayEvents(
-1, -1, [this, &stack, &stream](const QmlEvent &event,
const QmlEventType &type) {
if (isCanceled())
return;
@@ -741,6 +742,10 @@ void QmlProfilerFileWriter::saveQtd(QIODevice *device)
if ((event.timestamp() & 0xfff) == 0)
updateProgress(event.timestamp());
});
if (!success) {
emit error(tr("Could not re-read events from temporary trace file. Saving failed."));
return;
}
stream.writeEndElement(); // profilerDataModel
}
@@ -807,8 +812,9 @@ void QmlProfilerFileWriter::saveQzt(QFile *file)
if (!isCanceled()) {
buffer.open(QIODevice::WriteOnly);
m_model->replayEvents(-1, -1, [this, &stream, &buffer, &bufferStream](
const QmlEvent &event, const QmlEventType &type) {
const bool success = m_model->replayEvents(
-1, -1, [this, &stream, &buffer, &bufferStream](const QmlEvent &event,
const QmlEventType &type) {
Q_UNUSED(type);
bufferStream << event;
// 32MB buffer should be plenty for efficient compression
@@ -822,6 +828,10 @@ void QmlProfilerFileWriter::saveQzt(QFile *file)
updateProgress(event.timestamp());
}
});
if (!success) {
emit error(tr("Could not re-read events from temporary trace file. Saving failed."));
return;
}
}
if (isCanceled()) {