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

MeeGo: Fix process killing for long application names.

Browse Source 
QTCREATORBUG-5141

Change-Id: I92017c1892ccc76a396c10d9aee49ece10df4574
Reviewed-on: http://codereview.qt.nokia.com/1414
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-07-11 12:51:36 +02:00
parent 3fd95f8165
commit 404b797779
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
View File

@@ -41,8 +41,6 @@
#include <utils/ssh/sshconnectionmanager.h> #include <utils/ssh/sshconnectionmanager.h>
#include <utils/ssh/sshremoteprocess.h> #include <utils/ssh/sshremoteprocess.h>
#include <QtCore/QFileInfo>
#include <limits> #include <limits>
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state) #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
@@ -65,7 +63,12 @@ RemoteLinuxApplicationRunner::RemoteLinuxApplicationRunner(QObject *parent,
m_stopRequested(false), m_stopRequested(false),
m_state(Inactive) m_state(Inactive)
{ {
m_procsToKill << QFileInfo(m_remoteExecutable).fileName(); // Prevent pkill from matching our own pkill call.
QString pkillArg = m_remoteExecutable;
const int lastPos = pkillArg.count() - 1;
pkillArg.replace(lastPos, 1, QLatin1Char('[') + pkillArg.at(lastPos) + QLatin1Char(']'));
m_procsToKill << pkillArg;
connect(m_portsGatherer, SIGNAL(error(QString)), SLOT(handlePortsGathererError(QString))); connect(m_portsGatherer, SIGNAL(error(QString)), SLOT(handlePortsGathererError(QString)));
connect(m_portsGatherer, SIGNAL(portListReady()), SLOT(handleUsedPortsAvailable())); connect(m_portsGatherer, SIGNAL(portListReady()), SLOT(handleUsedPortsAvailable()));
} }
@@ -181,8 +184,13 @@ void RemoteLinuxApplicationRunner::cleanup()
emit reportProgress(tr("Killing remote process(es)...")); emit reportProgress(tr("Killing remote process(es)..."));
// pkill behaves differently on Fremantle and Harmattan. // Fremantle's busybox configuration is strange.
const char *const killTemplate = "pkill -%2 '^%1$'; pkill -%2 '/%1$';"; const char *killTemplate;
if (m_devConfig->osType() == LinuxDeviceConfiguration::Maemo5OsType)
killTemplate = "pkill -f -%2 %1;";
else
killTemplate = "pkill -%2 -f %1;";
QString niceKill; QString niceKill;
QString brutalKill; QString brutalKill;
foreach (const QString &proc, m_procsToKill) { foreach (const QString &proc, m_procsToKill) {
@@ -221,6 +229,7 @@ void RemoteLinuxApplicationRunner::handleCleanupFinished(int exitStatus)
if (exitStatus != SshRemoteProcess::ExitedNormally) { if (exitStatus != SshRemoteProcess::ExitedNormally) {
emitError(tr("Initial cleanup failed: %1").arg(m_cleaner->errorString())); emitError(tr("Initial cleanup failed: %1").arg(m_cleaner->errorString()));
emit remoteProcessFinished(InvalidExitCode);
return; return;
} }