forked from qt-creator/qt-creator
iOS: Remove the step to spawn the app before launch on iOS
This causes timing issues on certain devices resulting in app startup failure Task-number: QTCREATORBUG-17336 Change-Id: I190b5415bdef1fc80a415b0cb872b95b883db5d8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -169,8 +169,6 @@ IosDebugSupport::IosDebugSupport(IosRunConfiguration *runConfig,
|
|||||||
m_runner, &IosRunner::start);
|
m_runner, &IosRunner::start);
|
||||||
connect(m_runControl, &RunControl::finished,
|
connect(m_runControl, &RunControl::finished,
|
||||||
m_runner, &IosRunner::stop);
|
m_runner, &IosRunner::stop);
|
||||||
connect(m_runControl, &DebuggerRunControl::stateChanged,
|
|
||||||
m_runner, &IosRunner::debuggerStateChanged);
|
|
||||||
|
|
||||||
connect(m_runner, &IosRunner::gotServerPorts,
|
connect(m_runner, &IosRunner::gotServerPorts,
|
||||||
this, &IosDebugSupport::handleServerPorts);
|
this, &IosDebugSupport::handleServerPorts);
|
||||||
|
@@ -168,12 +168,6 @@ void IosRunner::stop()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosRunner::debuggerStateChanged(Debugger::DebuggerState state)
|
|
||||||
{
|
|
||||||
if (m_toolHandler)
|
|
||||||
m_toolHandler->debuggerStateChanged(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
void IosRunner::handleDidStartApp(IosToolHandler *handler, const QString &bundlePath,
|
void IosRunner::handleDidStartApp(IosToolHandler *handler, const QString &bundlePath,
|
||||||
const QString &deviceId, IosToolHandler::OpStatus status)
|
const QString &deviceId, IosToolHandler::OpStatus status)
|
||||||
{
|
{
|
||||||
|
@@ -65,9 +65,6 @@ public:
|
|||||||
void start();
|
void start();
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
public slots:
|
|
||||||
void debuggerStateChanged(Debugger::DebuggerState state);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void didStartApp(Ios::IosToolHandler::OpStatus status);
|
void didStartApp(Ios::IosToolHandler::OpStatus status);
|
||||||
void gotServerPorts(Utils::Port gdbPort, Utils::Port qmlPort);
|
void gotServerPorts(Utils::Port gdbPort, Utils::Port qmlPort);
|
||||||
|
@@ -34,6 +34,7 @@
|
|||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
#include "utils/runextensions.h"
|
#include "utils/runextensions.h"
|
||||||
|
#include "utils/synchronousprocess.h"
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
@@ -141,7 +142,6 @@ public:
|
|||||||
bool isRunning();
|
bool isRunning();
|
||||||
void start(const QString &exe, const QStringList &args);
|
void start(const QString &exe, const QStringList &args);
|
||||||
virtual void stop(int errorCode) = 0;
|
virtual void stop(int errorCode) = 0;
|
||||||
virtual void debuggerStateChanged(Debugger::DebuggerState state) { Q_UNUSED(state); }
|
|
||||||
|
|
||||||
// signals
|
// signals
|
||||||
void isTransferringApp(const QString &bundlePath, const QString &deviceId, int progress,
|
void isTransferringApp(const QString &bundlePath, const QString &deviceId, int progress,
|
||||||
@@ -230,20 +230,10 @@ private:
|
|||||||
* YES |
|
* YES |
|
||||||
* | |
|
* | |
|
||||||
* v |
|
* v |
|
||||||
* +---------+-------------------------+ |
|
* +---------+------------------------------+ |
|
||||||
* | SimulatorControl::spawnAppProcess | <------------------+
|
* | SimulatorControl::launchAppOnSimulator | <-------------+
|
||||||
* +-----------------------------------+
|
* +----------------------------------------+
|
||||||
* |
|
*
|
||||||
* v
|
|
||||||
* +--------+-----------+ +-----------------------------+
|
|
||||||
* | Debug Run ? +---YES------> + Wait for debugger to attach |
|
|
||||||
* +---------+----------+ +-----------+-----------------+
|
|
||||||
* NO |
|
|
||||||
* | |
|
|
||||||
* v |
|
|
||||||
* +-----------------------------+ |
|
|
||||||
* | SimulatorControl::launchApp | <-------------------+
|
|
||||||
* +-----------------------------+
|
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
class IosSimulatorToolHandlerPrivate : public IosToolHandlerPrivate
|
class IosSimulatorToolHandlerPrivate : public IosToolHandlerPrivate
|
||||||
{
|
{
|
||||||
@@ -260,15 +250,11 @@ public:
|
|||||||
const QString &deviceIdentifier, int timeout = 1000) override;
|
const QString &deviceIdentifier, int timeout = 1000) override;
|
||||||
void requestDeviceInfo(const QString &deviceId, int timeout = 1000) override;
|
void requestDeviceInfo(const QString &deviceId, int timeout = 1000) override;
|
||||||
void stop(int errorCode) override;
|
void stop(int errorCode) override;
|
||||||
void debuggerStateChanged(Debugger::DebuggerState state) override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void installAppOnSimulator();
|
void installAppOnSimulator();
|
||||||
void spawnAppOnSimulator(const QStringList &extraArgs);
|
void launchAppOnSimulator(const QStringList &extraArgs);
|
||||||
void launchAppOnSimulator();
|
|
||||||
|
|
||||||
bool isResponseValid(const SimulatorControl::ResponseData &responseData);
|
bool isResponseValid(const SimulatorControl::ResponseData &responseData);
|
||||||
void onResponseAppSpawn(const SimulatorControl::ResponseData &response);
|
|
||||||
|
|
||||||
void simAppProcessError(QProcess::ProcessError error);
|
void simAppProcessError(QProcess::ProcessError error);
|
||||||
void simAppProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
void simAppProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
@@ -277,7 +263,6 @@ private:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 appPId = -1;
|
qint64 appPId = -1;
|
||||||
bool appLaunched = false;
|
|
||||||
SimulatorControl *simCtl;
|
SimulatorControl *simCtl;
|
||||||
QList<QFuture<void>> futureList;
|
QList<QFuture<void>> futureList;
|
||||||
};
|
};
|
||||||
@@ -802,7 +787,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
|
|||||||
if (isResponseValid(response))
|
if (isResponseValid(response))
|
||||||
return;
|
return;
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
spawnAppOnSimulator(extraArgs);
|
launchAppOnSimulator(extraArgs);
|
||||||
} else {
|
} else {
|
||||||
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Simulator not running.")
|
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Simulator not running.")
|
||||||
.arg(bundlePath));
|
.arg(bundlePath));
|
||||||
@@ -811,7 +796,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (SimulatorControl::isSimulatorRunning(deviceId))
|
if (SimulatorControl::isSimulatorRunning(deviceId))
|
||||||
spawnAppOnSimulator(extraArgs);
|
launchAppOnSimulator(extraArgs);
|
||||||
else
|
else
|
||||||
futureList << Utils::onResultReady(simCtl->startSimulator(deviceId), onSimulatorStart);
|
futureList << Utils::onResultReady(simCtl->startSimulator(deviceId), onSimulatorStart);
|
||||||
}
|
}
|
||||||
@@ -824,14 +809,7 @@ void IosSimulatorToolHandlerPrivate::requestDeviceInfo(const QString &deviceId,
|
|||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::stop(int errorCode)
|
void IosSimulatorToolHandlerPrivate::stop(int errorCode)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (process) {
|
|
||||||
QTC_ASSERT(process.unique(), process->kill(); qCDebug(toolHandlerLog)<<"App process is not unique.");
|
|
||||||
process.reset();
|
|
||||||
appPId = -1;
|
appPId = -1;
|
||||||
appLaunched = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (auto f, futureList) {
|
foreach (auto f, futureList) {
|
||||||
if (!f.isFinished())
|
if (!f.isFinished())
|
||||||
f.cancel();
|
f.cancel();
|
||||||
@@ -841,14 +819,6 @@ void IosSimulatorToolHandlerPrivate::stop(int errorCode)
|
|||||||
q->finished(q);
|
q->finished(q);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::debuggerStateChanged(Debugger::DebuggerState state)
|
|
||||||
{
|
|
||||||
if (!appLaunched && state == Debugger::DebuggerState::InferiorRunOk) {
|
|
||||||
// Debugger attached. Launch it on the simulator.
|
|
||||||
launchAppOnSimulator();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
|
void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
|
||||||
{
|
{
|
||||||
auto onResponseAppInstall = [this](const SimulatorControl::ResponseData &response) {
|
auto onResponseAppInstall = [this](const SimulatorControl::ResponseData &response) {
|
||||||
@@ -871,23 +841,32 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
|
|||||||
onResponseAppInstall);
|
onResponseAppInstall);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::spawnAppOnSimulator(const QStringList &extraArgs)
|
void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &extraArgs)
|
||||||
{
|
{
|
||||||
Utils::FileName appBundle = Utils::FileName::fromString(bundlePath);
|
auto monitorPid = [this](QFutureInterface<int> &fi, qint64 pid) {
|
||||||
bool debugRun = runKind == IosToolHandler::DebugRun;
|
int exitCode = 0;
|
||||||
futureList << Utils::onResultReady(simCtl->spawnAppProcess(deviceId, appBundle, debugRun, extraArgs),
|
const QStringList args({QStringLiteral("-0"), QString::number(pid)});
|
||||||
std::bind(&IosSimulatorToolHandlerPrivate::onResponseAppSpawn, this, _1));
|
Utils::SynchronousProcess pKill;
|
||||||
|
while (!fi.isCanceled() && exitCode == 0) {
|
||||||
|
// Poll every 1 sec to check whether the app is running.
|
||||||
|
QThread::msleep(1000);
|
||||||
|
Utils::SynchronousProcessResponse resp = pKill.runBlocking(QStringLiteral("kill"), args);
|
||||||
|
exitCode = resp.exitCode;
|
||||||
}
|
}
|
||||||
|
// Future is cancelled if the app is stopped from the qt creator.
|
||||||
|
if (!fi.isCanceled())
|
||||||
|
stop(0);
|
||||||
|
};
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::launchAppOnSimulator()
|
auto onResponseAppLaunch = [this, monitorPid](const SimulatorControl::ResponseData &response) {
|
||||||
{
|
|
||||||
auto onResponseAppLaunch = [this](const SimulatorControl::ResponseData &response) {
|
|
||||||
if (!isResponseValid(response))
|
if (!isResponseValid(response))
|
||||||
return;
|
return;
|
||||||
|
if (response.success) {
|
||||||
if (response.pID != -1) {
|
appPId = response.pID;
|
||||||
appLaunched = true;
|
gotInferiorPid(bundlePath, deviceId, appPId);
|
||||||
didStartApp(bundlePath, deviceId, Ios::IosToolHandler::Success);
|
didStartApp(bundlePath, deviceId, Ios::IosToolHandler::Success);
|
||||||
|
// Start monitoring app's life signs.
|
||||||
|
futureList << Utils::runAsync(monitorPid, appPId);
|
||||||
} else {
|
} else {
|
||||||
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. %1")
|
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. %1")
|
||||||
.arg(QString::fromLocal8Bit(response.commandOutput)));
|
.arg(QString::fromLocal8Bit(response.commandOutput)));
|
||||||
@@ -896,16 +875,11 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator()
|
|||||||
q->finished(q);
|
q->finished(q);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (appPId != -1) {
|
|
||||||
Utils::FileName appBundle = Utils::FileName::fromString(bundlePath);
|
Utils::FileName appBundle = Utils::FileName::fromString(bundlePath);
|
||||||
futureList << Utils::onResultReady(simCtl->launchApp(deviceId,
|
futureList << Utils::onResultReady(simCtl->launchApp(deviceId,
|
||||||
SimulatorControl::bundleIdentifier(appBundle), appPId),
|
SimulatorControl::bundleIdentifier(appBundle),
|
||||||
onResponseAppLaunch);
|
runKind == IosToolHandler::DebugRun,
|
||||||
} else {
|
extraArgs), onResponseAppLaunch);
|
||||||
errorMsg(IosToolHandler::tr("Spawning the Application process on Simulator failed. Spawning timed out."));
|
|
||||||
didStartApp(bundlePath, deviceId, Ios::IosToolHandler::Failure);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::ResponseData &responseData)
|
bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::ResponseData &responseData)
|
||||||
@@ -921,40 +895,6 @@ bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::Res
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::onResponseAppSpawn(const SimulatorControl::ResponseData &response)
|
|
||||||
{
|
|
||||||
if (!isResponseValid(response))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (response.processInstance) {
|
|
||||||
QTC_ASSERT(!process || !isRunning(),
|
|
||||||
qCDebug(toolHandlerLog) << "Spwaning app while an app instance exits.");
|
|
||||||
process = response.processInstance;
|
|
||||||
QObject::connect(process.get(), &QProcess::readyReadStandardOutput,
|
|
||||||
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessHasData, this));
|
|
||||||
QObject::connect(process.get(), &QProcess::readyReadStandardError,
|
|
||||||
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessHasErrorOutput, this));
|
|
||||||
QObject::connect(process.get(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
|
|
||||||
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessFinished, this, _1, _2));
|
|
||||||
QObject::connect(process.get(), &QProcess::errorOccurred,
|
|
||||||
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1));
|
|
||||||
|
|
||||||
appPId = response.pID;
|
|
||||||
gotInferiorPid(bundlePath, deviceId, appPId);
|
|
||||||
|
|
||||||
// For normal run. Launch app on Simulator.
|
|
||||||
// For debug run, wait for the debugger to attach and then launch the app.
|
|
||||||
if (runKind == IosToolHandler::NormalRun)
|
|
||||||
launchAppOnSimulator();
|
|
||||||
} else {
|
|
||||||
errorMsg(IosToolHandler::tr("Spawning the Application process on Simulator failed. %1")
|
|
||||||
.arg(QString::fromLocal8Bit(response.commandOutput)));
|
|
||||||
didStartApp(bundlePath, deviceId, Ios::IosToolHandler::Failure);
|
|
||||||
stop(-1);
|
|
||||||
q->finished(q);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void IosSimulatorToolHandlerPrivate::simAppProcessError(QProcess::ProcessError error)
|
void IosSimulatorToolHandlerPrivate::simAppProcessError(QProcess::ProcessError error)
|
||||||
{
|
{
|
||||||
errorMsg(IosToolHandler::tr("Simulator application process error %1").arg(error));
|
errorMsg(IosToolHandler::tr("Simulator application process error %1").arg(error));
|
||||||
@@ -1010,11 +950,6 @@ void IosToolHandler::stop()
|
|||||||
d->stop(-1);
|
d->stop(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosToolHandler::debuggerStateChanged(int state)
|
|
||||||
{
|
|
||||||
d->debuggerStateChanged((Debugger::DebuggerState)state);
|
|
||||||
}
|
|
||||||
|
|
||||||
void IosToolHandler::requestTransferApp(const QString &bundlePath, const QString &deviceId,
|
void IosToolHandler::requestTransferApp(const QString &bundlePath, const QString &deviceId,
|
||||||
int timeout)
|
int timeout)
|
||||||
{
|
{
|
||||||
|
@@ -64,7 +64,6 @@ public:
|
|||||||
void requestDeviceInfo(const QString &deviceId, int timeout = 1000);
|
void requestDeviceInfo(const QString &deviceId, int timeout = 1000);
|
||||||
bool isRunning();
|
bool isRunning();
|
||||||
void stop();
|
void stop();
|
||||||
void debuggerStateChanged(int state);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void isTransferringApp(Ios::IosToolHandler *handler, const QString &bundlePath,
|
void isTransferringApp(Ios::IosToolHandler *handler, const QString &bundlePath,
|
||||||
|
@@ -42,13 +42,7 @@
|
|||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
#include <QMap>
|
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
#include <QReadLocker>
|
|
||||||
#include <QReadWriteLock>
|
|
||||||
#include <QTime>
|
|
||||||
#include <QUrl>
|
|
||||||
#include <QWriteLocker>
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@@ -63,7 +57,7 @@ static int COMMAND_TIMEOUT = 10000;
|
|||||||
static int SIMULATOR_START_TIMEOUT = 60000;
|
static int SIMULATOR_START_TIMEOUT = 60000;
|
||||||
static QString SIM_UDID_TAG = QStringLiteral("SimUdid");
|
static QString SIM_UDID_TAG = QStringLiteral("SimUdid");
|
||||||
|
|
||||||
static bool checkForTimeout(const chrono::time_point< chrono::high_resolution_clock, chrono::nanoseconds> &start, int msecs = COMMAND_TIMEOUT)
|
static bool checkForTimeout(const chrono::high_resolution_clock::time_point &start, int msecs = COMMAND_TIMEOUT)
|
||||||
{
|
{
|
||||||
bool timedOut = false;
|
bool timedOut = false;
|
||||||
auto end = chrono::high_resolution_clock::now();
|
auto end = chrono::high_resolution_clock::now();
|
||||||
@@ -75,6 +69,7 @@ static bool checkForTimeout(const chrono::time_point< chrono::high_resolution_cl
|
|||||||
static bool runCommand(QString command, const QStringList &args, QByteArray *output)
|
static bool runCommand(QString command, const QStringList &args, QByteArray *output)
|
||||||
{
|
{
|
||||||
Utils::SynchronousProcess p;
|
Utils::SynchronousProcess p;
|
||||||
|
p.setTimeoutS(-1);
|
||||||
Utils::SynchronousProcessResponse resp = p.runBlocking(command, args);
|
Utils::SynchronousProcessResponse resp = p.runBlocking(command, args);
|
||||||
if (output)
|
if (output)
|
||||||
*output = resp.allRawOutput();
|
*output = resp.allRawOutput();
|
||||||
@@ -89,31 +84,6 @@ static QByteArray runSimCtlCommand(QStringList args)
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool waitForProcessSpawn(qint64 processPId, QFutureInterface<SimulatorControl::ResponseData> &fi)
|
|
||||||
{
|
|
||||||
bool success = false;
|
|
||||||
if (processPId != -1) {
|
|
||||||
// Wait for app to reach intruptible sleep state.
|
|
||||||
const QStringList args = {QStringLiteral("-p"), QString::number(processPId),
|
|
||||||
QStringLiteral("-o"), QStringLiteral("wq=")};
|
|
||||||
int wqCount = -1;
|
|
||||||
QByteArray wqStr;
|
|
||||||
auto begin = chrono::high_resolution_clock::now();
|
|
||||||
do {
|
|
||||||
if (fi.isCanceled() || !runCommand(QStringLiteral("ps"), args, &wqStr))
|
|
||||||
break;
|
|
||||||
bool validInt = false;
|
|
||||||
wqCount = wqStr.trimmed().toInt(&validInt);
|
|
||||||
if (!validInt)
|
|
||||||
wqCount = -1;
|
|
||||||
} while (wqCount < 0 && !checkForTimeout(begin));
|
|
||||||
success = wqCount >= 0;
|
|
||||||
} else {
|
|
||||||
qCDebug(simulatorLog) << "Wait for spawned failed. Invalid Process ID." << processPId;
|
|
||||||
}
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
|
|
||||||
class SimulatorControlPrivate {
|
class SimulatorControlPrivate {
|
||||||
private:
|
private:
|
||||||
struct SimDeviceInfo {
|
struct SimDeviceInfo {
|
||||||
@@ -136,11 +106,9 @@ private:
|
|||||||
void startSimulator(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid);
|
void startSimulator(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid);
|
||||||
void installApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
|
void installApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
|
||||||
const Utils::FileName &bundlePath);
|
const Utils::FileName &bundlePath);
|
||||||
void spawnAppProcess(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
|
|
||||||
const Utils::FileName &bundlePath, bool waitForDebugger, QStringList extraArgs,
|
|
||||||
QThread *mainThread);
|
|
||||||
void launchApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
|
void launchApp(QFutureInterface<SimulatorControl::ResponseData> &fi, const QString &simUdid,
|
||||||
const QString &bundleIdentifier, qint64 spawnedPID);
|
const QString &bundleIdentifier, bool waitForDebugger,
|
||||||
|
const QStringList &extraArgs);
|
||||||
|
|
||||||
static QList<IosDeviceType> availableDevices;
|
static QList<IosDeviceType> availableDevices;
|
||||||
friend class SimulatorControl;
|
friend class SimulatorControl;
|
||||||
@@ -215,7 +183,7 @@ QString SimulatorControl::bundleExecutable(const Utils::FileName &bundlePath)
|
|||||||
return SimulatorControlPrivate::bundleExecutable(bundlePath);
|
return SimulatorControlPrivate::bundleExecutable(bundlePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
QFuture<SimulatorControl::ResponseData> SimulatorControl::startSimulator(const QString &simUdid)
|
QFuture<SimulatorControl::ResponseData> SimulatorControl::startSimulator(const QString &simUdid) const
|
||||||
{
|
{
|
||||||
return Utils::runAsync(&SimulatorControlPrivate::startSimulator, d, simUdid);
|
return Utils::runAsync(&SimulatorControlPrivate::startSimulator, d, simUdid);
|
||||||
}
|
}
|
||||||
@@ -227,19 +195,11 @@ SimulatorControl::installApp(const QString &simUdid, const Utils::FileName &bund
|
|||||||
}
|
}
|
||||||
|
|
||||||
QFuture<SimulatorControl::ResponseData>
|
QFuture<SimulatorControl::ResponseData>
|
||||||
SimulatorControl::spawnAppProcess(const QString &simUdid, const Utils::FileName &bundlePath,
|
SimulatorControl::launchApp(const QString &simUdid, const QString &bundleIdentifier,
|
||||||
bool waitForDebugger, const QStringList &extraArgs) const
|
bool waitForDebugger, const QStringList &extraArgs) const
|
||||||
{
|
{
|
||||||
return Utils::runAsync(&SimulatorControlPrivate::spawnAppProcess, d, simUdid, bundlePath,
|
return Utils::runAsync(&SimulatorControlPrivate::launchApp, d, simUdid, bundleIdentifier,
|
||||||
waitForDebugger, extraArgs, QThread::currentThread());
|
waitForDebugger, extraArgs);
|
||||||
}
|
|
||||||
|
|
||||||
QFuture<SimulatorControl::ResponseData>
|
|
||||||
SimulatorControl::launchApp(const QString &simUdid, const QString &bundleIdentifier,
|
|
||||||
qint64 spawnedPID) const
|
|
||||||
{
|
|
||||||
return Utils::runAsync(&SimulatorControlPrivate::launchApp, d, simUdid,
|
|
||||||
bundleIdentifier, spawnedPID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<IosDeviceType> SimulatorControlPrivate::availableDevices;
|
QList<IosDeviceType> SimulatorControlPrivate::availableDevices;
|
||||||
@@ -362,7 +322,6 @@ void SimulatorControlPrivate::startSimulator(QFutureInterface<SimulatorControl::
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!fi.isCanceled()) {
|
if (!fi.isCanceled()) {
|
||||||
QThread::msleep(500); // give it some time. TODO: find an actual fix.
|
|
||||||
fi.reportResult(response);
|
fi.reportResult(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -377,118 +336,31 @@ void SimulatorControlPrivate::installApp(QFutureInterface<SimulatorControl::Resp
|
|||||||
response.commandOutput = output;
|
response.commandOutput = output;
|
||||||
|
|
||||||
if (!fi.isCanceled()) {
|
if (!fi.isCanceled()) {
|
||||||
QThread::msleep(500); // give it some time. TODO: find an actual fix.
|
|
||||||
fi.reportResult(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SimulatorControlPrivate::spawnAppProcess(QFutureInterface<SimulatorControl::ResponseData> &fi,
|
|
||||||
const QString &simUdid, const Utils::FileName &bundlePath,
|
|
||||||
bool waitForDebugger, QStringList extraArgs, QThread *mainThread)
|
|
||||||
{
|
|
||||||
SimulatorControl::ResponseData response(simUdid);
|
|
||||||
|
|
||||||
// Find the path of the installed app.
|
|
||||||
QString bundleId = bundleIdentifier(bundlePath);
|
|
||||||
QByteArray appContainer = runSimCtlCommand({QStringLiteral("get_app_container"), simUdid, bundleId});
|
|
||||||
QString appPath = QString::fromLocal8Bit(appContainer.trimmed());
|
|
||||||
|
|
||||||
if (fi.isCanceled())
|
|
||||||
return;
|
|
||||||
|
|
||||||
QString executableName = bundleExecutable(bundlePath);
|
|
||||||
if (!appPath.isEmpty() && !executableName.isEmpty()) {
|
|
||||||
appPath.append('/' + executableName);
|
|
||||||
QStringList args = {QStringLiteral("simctl"), QStringLiteral("spawn"), simUdid, appPath};
|
|
||||||
if (waitForDebugger)
|
|
||||||
args.insert(2, QStringLiteral("-w"));
|
|
||||||
args << extraArgs;
|
|
||||||
|
|
||||||
// Spawn the app. The spawned app is started in suspended mode.
|
|
||||||
shared_ptr<QProcess> simCtlProcess(new QProcess, [](QProcess *p) {
|
|
||||||
if (p->state() != QProcess::NotRunning) {
|
|
||||||
p->kill();
|
|
||||||
p->waitForFinished(COMMAND_TIMEOUT);
|
|
||||||
}
|
|
||||||
delete p;
|
|
||||||
});
|
|
||||||
simCtlProcess->start(QStringLiteral("xcrun"), args);
|
|
||||||
if (simCtlProcess->waitForStarted()) {
|
|
||||||
if (fi.isCanceled())
|
|
||||||
return;
|
|
||||||
// Find the process id of the spawned app.
|
|
||||||
qint64 simctlPId = simCtlProcess->processId();
|
|
||||||
QByteArray commandOutput;
|
|
||||||
const QStringList pGrepArgs = {QStringLiteral("-f"), appPath};
|
|
||||||
auto begin = chrono::high_resolution_clock::now();
|
|
||||||
int processID = -1;
|
|
||||||
while (processID == -1 && runCommand(QStringLiteral("pgrep"), pGrepArgs, &commandOutput)) {
|
|
||||||
if (fi.isCanceled()) {
|
|
||||||
qCDebug(simulatorLog) <<"Spawning the app failed. Future cancelled.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
foreach (auto pidStr, commandOutput.trimmed().split('\n')) {
|
|
||||||
qint64 parsedPId = pidStr.toLongLong();
|
|
||||||
if (parsedPId != simctlPId)
|
|
||||||
processID = parsedPId;
|
|
||||||
}
|
|
||||||
if (checkForTimeout(begin)) {
|
|
||||||
qCDebug(simulatorLog) << "Spawning the app failed. Process timed out";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (processID == -1) {
|
|
||||||
qCDebug(simulatorLog) << "Spawning the app failed. App PID not found.";
|
|
||||||
simCtlProcess->waitForReadyRead(COMMAND_TIMEOUT);
|
|
||||||
response.commandOutput = simCtlProcess->readAllStandardError();
|
|
||||||
} else {
|
|
||||||
response.processInstance = simCtlProcess;
|
|
||||||
response.processInstance->moveToThread(mainThread);
|
|
||||||
response.pID = processID;
|
|
||||||
response.success = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCDebug(simulatorLog) << "Spawning the app failed." << simCtlProcess->errorString();
|
|
||||||
response.commandOutput = simCtlProcess->errorString().toLatin1();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCDebug(simulatorLog) << "Spawning the app failed. Check installed app." << appPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fi.isCanceled()) {
|
|
||||||
QThread::msleep(500); // give it some time. TODO: find an actual fix.
|
|
||||||
fi.reportResult(response);
|
fi.reportResult(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimulatorControlPrivate::launchApp(QFutureInterface<SimulatorControl::ResponseData> &fi,
|
void SimulatorControlPrivate::launchApp(QFutureInterface<SimulatorControl::ResponseData> &fi,
|
||||||
const QString &simUdid, const QString &bundleIdentifier,
|
const QString &simUdid, const QString &bundleIdentifier,
|
||||||
qint64 spawnedPID)
|
bool waitForDebugger, const QStringList &extraArgs)
|
||||||
{
|
{
|
||||||
SimulatorControl::ResponseData response(simUdid);
|
SimulatorControl::ResponseData response(simUdid);
|
||||||
if (!bundleIdentifier.isEmpty()) {
|
if (!bundleIdentifier.isEmpty() && !fi.isCanceled()) {
|
||||||
bool processSpawned = true;
|
QStringList args({QStringLiteral("launch"), simUdid, bundleIdentifier});
|
||||||
// Wait for the process to be spawned properly before launching app.
|
|
||||||
if (spawnedPID > -1)
|
|
||||||
processSpawned = waitForProcessSpawn(spawnedPID, fi);
|
|
||||||
|
|
||||||
if (fi.isCanceled())
|
if (waitForDebugger)
|
||||||
return;
|
args.insert(1, QStringLiteral("-w"));
|
||||||
|
|
||||||
|
foreach (const QString extraArgument, extraArgs) {
|
||||||
|
if (!extraArgument.trimmed().isEmpty())
|
||||||
|
args << extraArgument;
|
||||||
|
}
|
||||||
|
|
||||||
if (processSpawned) {
|
|
||||||
QThread::msleep(500); // give it some time. TODO: find an actual fix.
|
|
||||||
const QStringList args({QStringLiteral("launch"), simUdid , bundleIdentifier});
|
|
||||||
response.commandOutput = runSimCtlCommand(args);
|
response.commandOutput = runSimCtlCommand(args);
|
||||||
const QByteArray pIdStr = response.commandOutput.trimmed().split(' ').last().trimmed();
|
const QByteArray pIdStr = response.commandOutput.trimmed().split(' ').last().trimmed();
|
||||||
bool validInt = false;
|
bool validPid = false;
|
||||||
response.pID = pIdStr.toLongLong(&validInt);
|
response.pID = pIdStr.toLongLong(&validPid);
|
||||||
if (!validInt) {
|
response.success = validPid;
|
||||||
// Launch Failed.
|
|
||||||
qCDebug(simulatorLog) << "Launch app failed. Process id returned is not valid. PID =" << pIdStr;
|
|
||||||
response.pID = -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!fi.isCanceled()) {
|
if (!fi.isCanceled()) {
|
||||||
|
@@ -52,9 +52,6 @@ public:
|
|||||||
bool success = false;
|
bool success = false;
|
||||||
qint64 pID = -1;
|
qint64 pID = -1;
|
||||||
QByteArray commandOutput = "";
|
QByteArray commandOutput = "";
|
||||||
// For response type APP_SPAWN, the processInstance represents the control process of the spwaned app
|
|
||||||
// For other response types its null.
|
|
||||||
std::shared_ptr<QProcess> processInstance;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@@ -69,12 +66,10 @@ public:
|
|||||||
static QString bundleExecutable(const Utils::FileName &bundlePath);
|
static QString bundleExecutable(const Utils::FileName &bundlePath);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
QFuture<ResponseData> startSimulator(const QString &simUdid);
|
QFuture<ResponseData> startSimulator(const QString &simUdid) const;
|
||||||
QFuture<ResponseData> installApp(const QString &simUdid, const Utils::FileName &bundlePath) const;
|
QFuture<ResponseData> installApp(const QString &simUdid, const Utils::FileName &bundlePath) const;
|
||||||
QFuture<ResponseData> spawnAppProcess(const QString &simUdid, const Utils::FileName &bundlePath,
|
|
||||||
bool waitForDebugger, const QStringList &extraArgs) const;
|
|
||||||
QFuture<ResponseData> launchApp(const QString &simUdid, const QString &bundleIdentifier,
|
QFuture<ResponseData> launchApp(const QString &simUdid, const QString &bundleIdentifier,
|
||||||
qint64 spawnedPID = -1) const;
|
bool waitForDebugger, const QStringList &extraArgs) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SimulatorControlPrivate *d;
|
SimulatorControlPrivate *d;
|
||||||
|
Reference in New Issue
Block a user