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

Device support: Make sure a DeviceProcess always "finishes".

Browse Source 
We cannot technically enforce a remote process to actually terminate,
but we don't want the associated DeviceProcess to "hang" forever.
Therefore, we now
    a) check whether the kill operation reports an error and
    b) start a timer after starting the kill operation.
If the kill operation either "officially" fails or does not have the
desired effect of actually terminating the process within a given time
frame, we set the DeviceProcess to "finished" manually. This is the same
thing that already happens when the connection gets lost, where we also
report the DeviceProcess as finished, even though the remote process
might still be running.

Change-Id: I5620f90453463c64d3a84abd30f1ec7eec9d492d
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Christian Kandeler
2013-10-16 12:03:46 +02:00
parent 893c054ea0
commit 066f7b7594
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -38,6 +38,7 @@
#include <utils/qtcassert.h>
#include <QString>
#include <QTimer>
namespace ProjectExplorer {
@@ -54,6 +55,8 @@ public:
QStringList arguments;
QString errorMessage;
QSsh::SshRemoteProcess::ExitStatus exitStatus;
DeviceProcessSignalOperation::Ptr killOperation;
QTimer killTimer;
QByteArray stdOut;
QByteArray stdErr;
int exitCode;
@@ -70,6 +73,7 @@ SshDeviceProcess::SshDeviceProcess(const IDevice::ConstPtr &device, QObject *par
d->connection = 0;
d->state = SshDeviceProcessPrivate::Inactive;
setSshServerSupportsSignals(false);
connect(&d->killTimer, SIGNAL(timeout()), SLOT(handleKillOperationTimeout()));
}
SshDeviceProcess::~SshDeviceProcess()
@@ -223,6 +227,7 @@ void SshDeviceProcess::handleDisconnected()
emit error(QProcess::FailedToStart);
break;
case SshDeviceProcessPrivate::ProcessRunning:
d->exitStatus = QSsh::SshRemoteProcess::CrashExit;
emit finished();
default:
break;
@@ -271,6 +276,26 @@ void SshDeviceProcess::handleStderr()
emit readyReadStandardError();
}
void SshDeviceProcess::handleKillOperationFinished(const QString &errorMessage)
{
QTC_ASSERT(d->state == SshDeviceProcessPrivate::ProcessRunning, return);
if (errorMessage.isEmpty()) // Process will finish as expected; nothing to do here.
return;
d->exitStatus = QSsh::SshRemoteProcess::CrashExit; // Not entirely true, but it will get the message across.
d->errorMessage = tr("Failed to kill remote process: %1").arg(errorMessage);
d->setState(SshDeviceProcessPrivate::Inactive);
emit finished();
}
void SshDeviceProcess::handleKillOperationTimeout()
{
d->exitStatus = QSsh::SshRemoteProcess::CrashExit; // Not entirely true, but it will get the message across.
d->errorMessage = tr("Timeout waiting for remote process to finish.");
d->setState(SshDeviceProcessPrivate::Inactive);
emit finished();
}
QString SshDeviceProcess::fullCommandLine() const
{
QString cmdLine = executable();
@@ -296,10 +321,17 @@ void SshDeviceProcess::SshDeviceProcessPrivate::doSignal(QSsh::SshRemoteProcess:
process->sendSignal(signal);
} else {
DeviceProcessSignalOperation::Ptr signalOperation = q->device()->signalOperation();
if (signal == QSsh::SshRemoteProcess::IntSignal)
if (signal == QSsh::SshRemoteProcess::IntSignal) {
signalOperation->interruptProcess(executable);
else
} else {
if (killOperation) // We are already in the process of killing the app.
return;
killOperation = signalOperation;
connect(signalOperation.data(), SIGNAL(finished(QString)), q,
SLOT(handleKillOperationFinished(QString)));
killTimer.start(5000);
signalOperation->killProcess(executable);
}
}
break;
}
@@ -314,6 +346,11 @@ void SshDeviceProcess::SshDeviceProcessPrivate::setState(SshDeviceProcess::SshDe
if (state != Inactive)
return;
if (killOperation) {
killOperation->disconnect(q);
killOperation.clear();
}
killTimer.stop();
if (process)
process->disconnect(q);
if (connection) {