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

QmlProfiler: Avoid QtConcurrent

Browse Source 
QtConcurrent runs everything on a global thread pool, which means that
calls of QtConcurrent::run/map/etc can block each other.

Change-Id: Ia7a61b5ae1e0919113205a83a43caa1f27015732
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-02-02 10:23:00 +01:00
parent d4816850f0
commit e307b7eecf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,7 +338,7 @@ void QmlProfilerModelManager::save(const QString &filename)
d->notesModel->saveData(); d->notesModel->saveData();
QFuture<void> result = QtConcurrent::run<void>([this, file] (QFutureInterface<void> &future) { QFuture<void> result = Utils::runAsync<void>([this, file] (QFutureInterface<void> &future) {
QmlProfilerFileWriter writer; QmlProfilerFileWriter writer;
writer.setTraceTime(traceTime()->startTime(), traceTime()->endTime(), writer.setTraceTime(traceTime()->startTime(), traceTime()->endTime(),
traceTime()->duration()); traceTime()->duration());
@@ -367,7 +367,7 @@ void QmlProfilerModelManager::load(const QString &filename)
clear(); clear();
setState(AcquiringData); setState(AcquiringData);
QFuture<void> result = QtConcurrent::run<void>([this, file] (QFutureInterface<void> &future) { QFuture<void> result = Utils::runAsync<void>([this, file] (QFutureInterface<void> &future) {
QmlProfilerFileReader reader; QmlProfilerFileReader reader;
reader.setFuture(&future); reader.setFuture(&future);
connect(&reader, &QmlProfilerFileReader::error, this, &QmlProfilerModelManager::error); connect(&reader, &QmlProfilerFileReader::error, this, &QmlProfilerModelManager::error);