Commit 1d166f8f authored by David Kaspar's avatar David Kaspar

Qnx: Fixing "Show Running Processes" for BlackBerry devices

BlackBerryDeviceConfiguration is using the same QnxDeviceProcessList
as QnxDeviceConfiguration.

Task-number: QTCREATORBUG-9976
Change-Id: Ic07297619d4d5d4280918df4e1ea21b958fd1050
Reviewed-by: default avatarFanda Vacek <fvacek@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: default avatarDavid Kaspar <dkaspar@blackberry.com>
parent 0643b832
......@@ -35,6 +35,7 @@
#include "qnxdeviceprocesssignaloperation.h"
#include "blackberrydeviceconfigurationwidget.h"
#include "blackberrydeviceconnectionmanager.h"
#include "qnxdeviceprocesslist.h"
#include <projectexplorer/kitinformation.h>
#include <ssh/sshconnection.h>
......@@ -162,6 +163,11 @@ QVariantMap BlackBerryDeviceConfiguration::toMap() const
return map;
}
DeviceProcessList *BlackBerryDeviceConfiguration::createProcessListModel(QObject *parent) const
{
return new QnxDeviceProcessList(sharedFromThis(), parent);
}
DeviceProcessSignalOperation::Ptr BlackBerryDeviceConfiguration::signalOperation() const
{
return DeviceProcessSignalOperation::Ptr(
......
......@@ -64,6 +64,7 @@ public:
QString displayNameForActionId(Core::Id actionId) const;
void executeAction(Core::Id actionId, QWidget *parent);
ProjectExplorer::IDevice::Ptr clone() const;
ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const;
bool hasDeviceTester() const;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const;
......
......@@ -96,7 +96,8 @@ SOURCES += qnxplugin.cpp \
blackberryconfigurationmanager.cpp \
blackberrydevicelistdetector.cpp \
blackberrylogprocessrunner.cpp \
qnxdeviceprocesssignaloperation.cpp
qnxdeviceprocesssignaloperation.cpp \
qnxdeviceprocesslist.cpp
HEADERS += qnxplugin.h\
qnxconstants.h \
......@@ -192,7 +193,8 @@ HEADERS += qnxplugin.h\
blackberryconfigurationmanager.h \
blackberrydevicelistdetector.h \
blackberrylogprocessrunner.h \
qnxdeviceprocesssignaloperation.h
qnxdeviceprocesssignaloperation.h \
qnxdeviceprocesslist.h
FORMS += \
blackberrydeviceconfigurationwizardsetuppage.ui \
......
......@@ -213,6 +213,8 @@ QtcPlugin {
"qnxdeviceconfigurationwizard.h",
"qnxdeviceconfigurationwizardpages.cpp",
"qnxdeviceconfigurationwizardpages.h",
"qnxdeviceprocesslist.cpp",
"qnxdeviceprocesslist.h",
"qnxdeviceprocesssignaloperation.cpp",
"qnxdeviceprocesssignaloperation.h",
"qnxdevicetester.cpp",
......
......@@ -31,9 +31,9 @@
#include "qnxdeviceconfiguration.h"
#include "qnxdevicetester.h"
#include "qnxdeviceprocesslist.h"
#include "qnxdeviceprocesssignaloperation.h"
#include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
#include <ssh/sshconnection.h>
#include <QRegExp>
......@@ -80,51 +80,6 @@ class QnxPortsGatheringMethod : public ProjectExplorer::PortsGatheringMethod
}
};
class QnxDeviceProcessList : public ProjectExplorer::SshDeviceProcessList
{
public:
QnxDeviceProcessList(const ProjectExplorer::IDevice::ConstPtr &device, QObject *parent)
: SshDeviceProcessList(device, parent)
{
}
private:
QString listProcessesCommandLine() const
{
return QLatin1String("pidin -F \"%a %A '/%n'\"");
}
QList<ProjectExplorer::DeviceProcessItem> buildProcessList(const QString &listProcessesReply) const
{
QList<ProjectExplorer::DeviceProcessItem> processes;
QStringList lines = listProcessesReply.split(QLatin1Char('\n'));
if (lines.isEmpty())
return processes;
lines.pop_front(); // drop headers
QRegExp re(QLatin1String("\\s*(\\d+)\\s+(.*)'(.*)'"));
foreach (const QString& line, lines) {
if (re.exactMatch(line)) {
const QStringList captures = re.capturedTexts();
if (captures.size() == 4) {
const int pid = captures[1].toInt();
const QString args = captures[2];
const QString exe = captures[3];
ProjectExplorer::DeviceProcessItem deviceProcess;
deviceProcess.pid = pid;
deviceProcess.exe = exe.trimmed();
deviceProcess.cmdLine = args.trimmed();
processes.append(deviceProcess);
}
}
}
qSort(processes);
return processes;
}
};
QnxDeviceConfiguration::QnxDeviceConfiguration()
: RemoteLinux::LinuxDevice()
{
......
/**************************************************************************
**
** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
**
** Contact: BlackBerry Limited (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "qnxdeviceprocesslist.h"
#include <QRegExp>
#include <QStringList>
using namespace Qnx;
using namespace Qnx::Internal;
QnxDeviceProcessList::QnxDeviceProcessList(
const ProjectExplorer::IDevice::ConstPtr &device, QObject *parent)
: ProjectExplorer::SshDeviceProcessList(device, parent)
{
}
QString QnxDeviceProcessList::listProcessesCommandLine() const
{
return QLatin1String("pidin -F \"%a %A '/%n'\"");
}
QList<ProjectExplorer::DeviceProcessItem> QnxDeviceProcessList::buildProcessList(
const QString &listProcessesReply) const
{
QList<ProjectExplorer::DeviceProcessItem> processes;
QStringList lines = listProcessesReply.split(QLatin1Char('\n'));
if (lines.isEmpty())
return processes;
lines.pop_front(); // drop headers
QRegExp re(QLatin1String("\\s*(\\d+)\\s+(.*)'(.*)'"));
foreach (const QString& line, lines) {
if (re.exactMatch(line)) {
const QStringList captures = re.capturedTexts();
if (captures.size() == 4) {
const int pid = captures[1].toInt();
const QString args = captures[2];
const QString exe = captures[3];
ProjectExplorer::DeviceProcessItem deviceProcess;
deviceProcess.pid = pid;
deviceProcess.exe = exe.trimmed();
deviceProcess.cmdLine = args.trimmed();
processes.append(deviceProcess);
}
}
}
qSort(processes);
return processes;
}
/**************************************************************************
**
** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
**
** Contact: BlackBerry Limited (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QNX_INTERNAL_QNXDEVICEPROCESSLIST_H
#define QNX_INTERNAL_QNXDEVICEPROCESSLIST_H
#include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
namespace Qnx {
namespace Internal {
class QnxDeviceProcessList : public ProjectExplorer::SshDeviceProcessList
{
Q_OBJECT
public:
explicit QnxDeviceProcessList(
const ProjectExplorer::IDevice::ConstPtr &device, QObject *parent = 0);
private:
virtual QString listProcessesCommandLine() const;
virtual QList<ProjectExplorer::DeviceProcessItem> buildProcessList(
const QString &listProcessesReply) const;
};
} // namespace Internal
} // namespace Qnx
#endif // QNX_INTERNAL_QNXDEVICEPROCESSLIST_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment