Introduce static localProcesses() method to DeviceProcessList.

Add synchronous static getLocalProcesses() (platformspecific)
method to LocalProcessList, use that for the model, simplifying
the code of doUpdate(). Use that for
DeviceProcessList::localProcesses().

Polish the proclist-method for UNIX a bit such that it tries
to read out the 'cmdline' first to obtain the complete
command line and full path to the executable.

Similarly, set the absolute image path on Windows.

Implement doKill() on Windows.

Change-Id: I3a5b990eaa9f6beb4c589406bdf4c7a234e40734
Reviewed-by: hjk <qthjk@ovi.com>

4 files changed, 81 insertions, 45 deletions

diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
index 20c068ba98..d150048788 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
@@ -28,6 +28,7 @@
 **************************************************************************/
 
 #include "deviceprocesslist.h"
+#include "localprocesslist.h"
 
 #include <utils/qtcassert.h>
 
@@ -181,6 +182,10 @@ void DeviceProcessList::reportError(const QString &message)
     emit error(message);
 }
 
+QList<DeviceProcess> DeviceProcessList::localProcesses()
+{
+    return LocalProcessList::getLocalProcesses();
+}
 
 bool DeviceProcess::operator <(const DeviceProcess &other) const
 {
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
index 46da8d1c51..880c418a89 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
@@ -63,6 +63,8 @@ public:
     void killProcess(int row);
     DeviceProcess at(int row) const;
 
+    static QList<DeviceProcess> localProcesses();
+
 signals:
     void processListUpdated();
     void error(const QString &errorMsg);
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
index 0ae819d458..f0cd6668c7 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
@@ -97,7 +97,7 @@ LocalProcessList::LocalProcessList(const IDevice::ConstPtr &device, QObject *par
 {
 }
 
-void LocalProcessList::handleWindowsUpdate()
+QList<DeviceProcess> LocalProcessList::getLocalProcesses()
 {
     QList<DeviceProcess> processes;
 
@@ -105,30 +105,38 @@ void LocalProcessList::handleWindowsUpdate()
     pe.dwSize = sizeof(PROCESSENTRY32);
     HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (snapshot == INVALID_HANDLE_VALUE)
-        return;
+        return processes;
 
     for (bool hasNext = Process32First(snapshot, &pe); hasNext; hasNext = Process32Next(snapshot, &pe)) {
         DeviceProcess p;
         p.pid = pe.th32ProcessID;
-        p.exe = QString::fromUtf16(reinterpret_cast<ushort*>(pe.szExeFile));
-        p.cmdLine = imageName(pe.th32ProcessID);
-        if (p.cmdLine.isEmpty())
-            p.cmdLine = p.exe;
+        // Image has the absolute path, but can fail.
+        const QString image = imageName(pe.th32ProcessID);
+        p.exe = p.cmdLine = image.isEmpty() ?
+            QString::fromWCharArray(pe.szExeFile) :
+            image;
         processes << p;
     }
     CloseHandle(snapshot);
-
-    reportProcessListUpdated(processes);
-}
-
-void LocalProcessList::doUpdate()
-{
-    QTimer::singleShot(0, this, SLOT(handleWindowsUpdate()));
+    return processes;
 }
 
 void LocalProcessList::doKillProcess(const DeviceProcess &process)
 {
-    Q_UNUSED(process);
+    const DWORD rights = PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION
+            |PROCESS_VM_OPERATION|PROCESS_VM_WRITE|PROCESS_VM_READ
+            |PROCESS_DUP_HANDLE|PROCESS_TERMINATE|PROCESS_CREATE_THREAD|PROCESS_SUSPEND_RESUME;
+    const HANDLE handle = OpenProcess(rights, FALSE, process.pid);
+    if (!handle) {
+        qWarning("Cannot open process %d: %s" , process.pid,
+                 qPrintable(Utils::winErrorMessage(GetLastError())));
+        return;
+    }
+    if (!TerminateProcess(handle, UINT(-1))) {
+        qWarning("Cannot terminate process %d: %s" , process.pid,
+                 qPrintable(Utils::winErrorMessage(GetLastError())));
+    }
+    CloseHandle(handle);
 }
 
 #endif //Q_OS_WIN
@@ -150,38 +158,53 @@ static bool isUnixProcessId(const QString &procname)
 
 // Determine UNIX processes by reading "/proc". Default to ps if
 // it does not exist
-void LocalProcessList::updateUsingProc()
+
+static const char procDirC[] = "/proc/";
+
+static QList<DeviceProcess> getLocalProcessesUsingProc(const QDir &procDir)
 {
     QList<DeviceProcess> processes;
-    const QDir procDir(QLatin1String("/proc/"));
+    const QString procDirPath = QLatin1String(procDirC);
     const QStringList procIds = procDir.entryList();
     foreach (const QString &procId, procIds) {
         if (!isUnixProcessId(procId))
             continue;
-        QString filename = QLatin1String("/proc/");
-        filename += procId;
-        filename += QLatin1String("/stat");
-        QFile file(filename);
-        if (!file.open(QIODevice::ReadOnly))
-            continue;           // process may have exited
-
-        const QStringList data = QString::fromLocal8Bit(file.readAll()).split(QLatin1Char(' '));
         DeviceProcess proc;
         proc.pid = procId.toInt();
-        proc.exe = data.at(1);
-        proc.cmdLine = data.at(1);
-        if (proc.exe.startsWith(QLatin1Char('(')) && proc.exe.endsWith(QLatin1Char(')'))) {
-            proc.exe.truncate(proc.exe.size() - 1);
-            proc.exe.remove(0, 1);
+        const QString root = procDirPath + procId;
+        QFile cmdLineFile(root + QLatin1String("/cmdline"));
+        if (cmdLineFile.open(QIODevice::ReadOnly)) { // process may have exited
+            QList<QByteArray> tokens = cmdLineFile.readAll().split('\0');
+            if (!tokens.isEmpty()) {
+                proc.exe =  QString::fromLocal8Bit(tokens.front());
+                foreach (const QByteArray &t,  tokens) {
+                    if (!proc.cmdLine.isEmpty())
+                        proc.cmdLine.append(QLatin1Char(' '));
+                    proc.cmdLine.append(QString::fromLocal8Bit(t));
+                }
+            }
         }
-        // PPID is element 3
-        processes.push_back(proc);
+
+        if (proc.exe.isEmpty()) {
+            QFile statFile(root + QLatin1String("/stat"));
+            if (!statFile.open(QIODevice::ReadOnly)) {
+                const QStringList data = QString::fromLocal8Bit(statFile.readAll()).split(QLatin1Char(' '));
+                proc.exe = data.at(1);
+                proc.cmdLine = data.at(1); // PPID is element 3
+                if (proc.exe.startsWith(QLatin1Char('(')) && proc.exe.endsWith(QLatin1Char(')'))) {
+                    proc.exe.truncate(proc.exe.size() - 1);
+                    proc.exe.remove(0, 1);
+                }
+            }
+        }
+        if (!proc.exe.isEmpty())
+            processes.push_back(proc);
     }
-    reportProcessListUpdated(processes);
+    return processes;
 }
 
 // Determine UNIX processes by running ps
-void LocalProcessList::updateUsingPs()
+static QList<DeviceProcess> getLocalProcessesUsingPs()
 {
 #ifdef Q_OS_MAC
     static const char formatC[] = "pid state command";
@@ -214,16 +237,13 @@ void LocalProcessList::updateUsingPs()
             }
         }
     }
-    reportProcessListUpdated(processes);
+    return processes;
 }
 
-void LocalProcessList::doUpdate()
+QList<DeviceProcess> LocalProcessList::getLocalProcesses()
 {
-    const QDir procDir(QLatin1String("/proc/"));
-    if (procDir.exists())
-        QTimer::singleShot(0, this, SLOT(updateUsingProc()));
-    else
-        QTimer::singleShot(0, this, SLOT(updateUsingPs()));
+    const QDir procDir = QDir(QLatin1String(procDirC));
+    return procDir.exists() ? getLocalProcessesUsingProc(procDir) : getLocalProcessesUsingPs();
 }
 
 void LocalProcessList::doKillProcess(const DeviceProcess &process)
@@ -252,5 +272,15 @@ Qt::ItemFlags LocalProcessList::flags(const QModelIndex &index) const
     return flags;
 }
 
+void LocalProcessList::handleUpdate()
+{
+    reportProcessListUpdated(getLocalProcesses());
+}
+
+void LocalProcessList::doUpdate()
+{
+    QTimer::singleShot(0, this, SLOT(handleUpdate()));
+}
+
 } // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.h b/src/plugins/projectexplorer/devicesupport/localprocesslist.h
index 8bf97234ae..732bd5df57 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.h
@@ -49,17 +49,16 @@ public:
     LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = 0);
     virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 
+    static QList<DeviceProcess> getLocalProcesses();
+
 private:
     void doUpdate();
     void doKillProcess(const DeviceProcess &process);
 
 private slots:
-#if defined(Q_OS_WIN)
-    void handleWindowsUpdate();
-#elif defined(Q_OS_UNIX)
+    void handleUpdate();
+#ifdef Q_OS_UNIX
     void reportDelayedKillStatus();
-    void updateUsingProc();
-    void updateUsingPs();
 #endif
 
 private: