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

iOS: Make updating available simulators asynchronous

Browse Source 
Also remove unneeded lock

Change-Id: I8db798bd0b8790ced198cf57e30e22a96a0eb0a2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2016-10-27 16:45:20 +02:00
parent 85e8bdb3ba
commit 644756d80a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -27,6 +27,8 @@
#include "iossimulator.h" #include "iossimulator.h"
#include "iosconfigurations.h" #include "iosconfigurations.h"
#include <utils/runextensions.h>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#endif #endif
@@ -95,7 +97,6 @@ private:
QHash<QString, QProcess*> simulatorProcesses; QHash<QString, QProcess*> simulatorProcesses;
QReadWriteLock processDataLock; QReadWriteLock processDataLock;
QList<IosDeviceType> availableDevices; QList<IosDeviceType> availableDevices;
QReadWriteLock deviceDataLock;
friend class SimulatorControl; friend class SimulatorControl;
}; };
@@ -108,16 +109,15 @@ SimulatorControl::SimulatorControl()
QList<Ios::Internal::IosDeviceType> SimulatorControl::availableSimulators() QList<Ios::Internal::IosDeviceType> SimulatorControl::availableSimulators()
{ {
QReadLocker locer(&d->deviceDataLock);
return d->availableDevices; return d->availableDevices;
} }
void SimulatorControl::updateAvailableSimulators() static QList<IosDeviceType> getAvailableSimulators()
{ {
QList<IosDeviceType> availableDevices;
const QByteArray output = runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")}); const QByteArray output = runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")});
QJsonDocument doc = QJsonDocument::fromJson(output); QJsonDocument doc = QJsonDocument::fromJson(output);
if (!doc.isNull()) { if (!doc.isNull()) {
QList<IosDeviceType> availableDevices;
const QJsonObject buildInfo = doc.object().value("devices").toObject(); const QJsonObject buildInfo = doc.object().value("devices").toObject();
foreach (const QString &buildVersion, buildInfo.keys()) { foreach (const QString &buildVersion, buildInfo.keys()) {
QJsonArray devices = buildInfo.value(buildVersion).toArray(); QJsonArray devices = buildInfo.value(buildVersion).toArray();
@@ -134,14 +134,18 @@ void SimulatorControl::updateAvailableSimulators()
} }
} }
std::stable_sort(availableDevices.begin(), availableDevices.end()); std::stable_sort(availableDevices.begin(), availableDevices.end());
{
QWriteLocker locker(&d->deviceDataLock);
d->availableDevices = availableDevices;
}
} else { } else {
qCDebug(simulatorLog) << "Error parsing json output from simctl. Output:" << output; qCDebug(simulatorLog) << "Error parsing json output from simctl. Output:" << output;
} }
return availableDevices;
}
void SimulatorControl::updateAvailableSimulators()
{
QFuture<QList<IosDeviceType>> future = Utils::runAsync(getAvailableSimulators);
Utils::onResultReady(future, d, [](const QList<IosDeviceType> &devices) {
SimulatorControl::d->availableDevices = devices;
});
} }
// Blocks until simulators reaches "Booted" state. // Blocks until simulators reaches "Booted" state.