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

Use Utils::FutureSynchronizer in IosSimulatorToolHandlerPrivate

Browse Source 
Add a new method: void FutureSynchronizer::cancelAllFutures().

Change-Id: I5a4e1ea3230ac3c0ce9d3f26b751b2c05fe3dfd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-05-12 15:58:39 +02:00
committed by Eike Ziller
parent 76db1e3746
commit 69b3c6c1fd
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/futuresynchronizer.cpp
View File

@@ -44,15 +44,19 @@ bool FutureSynchronizer::isEmpty() const
void FutureSynchronizer::waitForFinished()
{
if (m_cancelOnWait) {
for (QFuture<void> &future : m_futures)
future.cancel();
}
if (m_cancelOnWait)
cancelAllFutures();
for (QFuture<void> &future : m_futures)
future.waitForFinished();
clearFutures();
}
void FutureSynchronizer::cancelAllFutures()
{
for (QFuture<void> &future : m_futures)
future.cancel();
}
void FutureSynchronizer::clearFutures()
{
m_futures.clear();

1
src/libs/utils/futuresynchronizer.h
View File

@@ -49,6 +49,7 @@ public:
bool isEmpty() const;
void waitForFinished();
void cancelAllFutures();
void clearFutures();
void setCancelOnWait(bool enabled);

29
src/plugins/ios/iostoolhandler.cpp
View File

@@ -34,6 +34,7 @@
#include <debugger/debuggerconstants.h>
#include <utils/fileutils.h>
#include <utils/futuresynchronizer.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/runextensions.h>
@@ -328,7 +329,7 @@ private:
qint64 m_pid = -1;
SimulatorControl *simCtl;
LogTailFiles outputLogger;
QList<QFuture<void>> futureList;
Utils::FutureSynchronizer futureSynchronizer;
};
IosToolHandlerPrivate::IosToolHandlerPrivate(const IosDeviceType &devType,
@@ -807,14 +808,12 @@ IosSimulatorToolHandlerPrivate::IosSimulatorToolHandlerPrivate(const IosDeviceTy
{
QObject::connect(&outputLogger, &LogTailFiles::logMessage,
std::bind(&IosToolHandlerPrivate::appOutput, this, _1));
futureSynchronizer.setCancelOnWait(true);
}
IosSimulatorToolHandlerPrivate::~IosSimulatorToolHandlerPrivate()
{
foreach (auto f, futureList) {
if (!f.isFinished())
f.cancel();
}
futureSynchronizer.waitForFinished();
delete simCtl;
}
void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundlePath,
@@ -841,7 +840,7 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle
if (SimulatorControl::isSimulatorRunning(m_deviceId))
installAppOnSimulator();
else
futureList << QFuture<void>(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
futureSynchronizer.addFuture(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
}
void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
@@ -877,7 +876,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
if (SimulatorControl::isSimulatorRunning(m_deviceId))
launchAppOnSimulator(extraArgs);
else
futureList << QFuture<void>(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
futureSynchronizer.addFuture(Utils::onResultReady(simCtl->startSimulator(m_deviceId), onSimulatorStart));
}
void IosSimulatorToolHandlerPrivate::requestDeviceInfo(const QString &deviceId, int timeout)
@@ -902,10 +901,8 @@ void IosSimulatorToolHandlerPrivate::stop(int errorCode)
kill(m_pid, SIGKILL);
#endif
m_pid = -1;
foreach (auto f, futureList) {
if (!f.isFinished())
f.cancel();
}
futureSynchronizer.cancelAllFutures();
futureSynchronizer.flushFinishedFutures();
toolExited(errorCode);
emit q->finished(q);
@@ -930,7 +927,7 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
isTransferringApp(m_bundlePath, m_deviceId, 20, 100, "");
auto installFuture = simCtl->installApp(m_deviceId, Utils::FilePath::fromString(m_bundlePath));
futureList << QFuture<void>(Utils::onResultReady(installFuture, onResponseAppInstall));
futureSynchronizer.addFuture(Utils::onResultReady(installFuture, onResponseAppInstall));
}
void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &extraArgs)
@@ -979,10 +976,10 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
gotInferiorPid(m_bundlePath, m_deviceId, response.pID);
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Success);
// Start monitoring app's life signs.
futureList << Utils::runAsync(monitorPid, response.pID);
futureSynchronizer.addFuture(Utils::runAsync(monitorPid, response.pID));
if (captureConsole)
futureList << Utils::runAsync(&LogTailFiles::exec, &outputLogger, stdoutFile,
stderrFile);
futureSynchronizer.addFuture(Utils::runAsync(&LogTailFiles::exec, &outputLogger,
stdoutFile, stderrFile));
} else {
m_pid = -1;
errorMsg(IosToolHandler::tr("Application launch on simulator failed. %1")
@@ -993,7 +990,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
}
};
futureList << QFuture<void>(Utils::onResultReady(
futureSynchronizer.addFuture(Utils::onResultReady(
simCtl->launchApp(m_deviceId, bundleId, debugRun, extraArgs,
captureConsole ? stdoutFile->fileName() : QString(),
captureConsole ? stderrFile->fileName() : QString()),