Qnx: Add support for QML Profiler

Change-Id: Ib87a39177120458155bbb657ff8c9b09e1a6ccb5
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

src/plugins/analyzerbase/ianalyzerengine.h

@@ -84,6 +84,7 @@ public:
     StartMode mode() const { return m_sp.startMode; }
 
     virtual void notifyRemoteSetupDone(quint16) {}
+    virtual void notifyRemoteFinished(bool) {}
 
 public slots:
     virtual void logApplicationMessage(const QString &, Utils::OutputFormat) {}

src/plugins/qmlprofiler/qmlprofilerengine.cpp

@@ -189,7 +189,7 @@ bool QmlProfilerEngine::start()
     }
 
     if (d->m_runner) {
-        connect(d->m_runner, SIGNAL(stopped()), this, SLOT(processEnded()));
+        connect(d->m_runner, SIGNAL(stopped()), this, SLOT(notifyRemoteFinished()));
         connect(d->m_runner, SIGNAL(appendMessage(QString,Utils::OutputFormat)),
                 this, SLOT(logApplicationMessage(QString,Utils::OutputFormat)));
         d->m_runner->start();
@@ -230,13 +230,16 @@ void QmlProfilerEngine::stop()
     }
 }
 
-void QmlProfilerEngine::processEnded()
+void QmlProfilerEngine::notifyRemoteFinished(bool success)
 {
     QTC_ASSERT(d->m_profilerState, return);
 
     switch (d->m_profilerState->currentState()) {
     case QmlProfilerStateManager::AppRunning : {
-        d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
+        if (success)
+            d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
+        else
+            d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
         AnalyzerManager::stopTool();
 
         emit finished();

src/plugins/qmlprofiler/qmlprofilerengine.h

@@ -62,7 +62,7 @@ public slots:
     void stop();
 
 private slots:
-    void processEnded();
+    void notifyRemoteFinished(bool success = true);
 
     void cancelProcess();
     void logApplicationMessage(const QString &msg, Utils::OutputFormat format);

src/plugins/qnx/qnx.pro

@@ -33,6 +33,8 @@ SOURCES += qnxplugin.cpp \
     qnxdeviceconfigurationwizardpages.cpp \
     qnxrunconfiguration.cpp \
     qnxruncontrolfactory.cpp \
+    qnxabstractrunsupport.cpp \
+    qnxanalyzesupport.cpp \
     qnxdebugsupport.cpp \
     qnxdeploystepfactory.cpp \
     qnxdeployconfigurationfactory.cpp \
@@ -123,6 +125,8 @@ HEADERS += qnxplugin.h\
     qnxdeviceconfigurationwizardpages.h \
     qnxrunconfiguration.h \
     qnxruncontrolfactory.h \
+    qnxabstractrunsupport.h \
+    qnxanalyzesupport.h \
     qnxdebugsupport.h \
     qnxdeploystepfactory.h \
     qnxdeployconfigurationfactory.h \

src/plugins/qnx/qnx.qbs

@@ -188,6 +188,10 @@ QtcPlugin {
         "qnxbaseqtconfigwidget.h",
         "qnxbaseqtconfigwidget.ui",
         "qnxconstants.h",
+        "qnxabstractrunsupport.cpp",
+        "qnxabstractrunsupport.h",
+        "qnxanalyzesupport.cpp",
+        "qnxanalyzesupport.h",
         "qnxdebugsupport.cpp",
         "qnxdebugsupport.h",
         "qnxdeployconfiguration.cpp",

src/plugins/qnx/qnxabstractrunsupport.cpp

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 "qnxabstractrunsupport.h"
+#include "qnxrunconfiguration.h"
+
+#include <projectexplorer/devicesupport/deviceapplicationrunner.h>
+#include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
+#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/target.h>
+#include <utils/portlist.h>
+#include <utils/qtcassert.h>
+
+using namespace ProjectExplorer;
+using namespace RemoteLinux;
+
+using namespace Qnx;
+using namespace Qnx::Internal;
+
+QnxAbstractRunSupport::QnxAbstractRunSupport(QnxRunConfiguration *runConfig, QObject *parent)
+    : QObject(parent)
+    , m_remoteExecutable(runConfig->remoteExecutableFilePath())
+    , m_commandPrefix(runConfig->commandPrefix())
+    , m_device(DeviceKitInformation::device(runConfig->target()->kit()))
+    , m_state(Inactive)
+{
+    m_runner = new DeviceApplicationRunner(this);
+    m_portsGatherer = new DeviceUsedPortsGatherer(this);
+
+    connect(m_portsGatherer, SIGNAL(error(QString)), SLOT(handleError(QString)));
+    connect(m_portsGatherer, SIGNAL(portListReady()), SLOT(handlePortListReady()));
+}
+
+void QnxAbstractRunSupport::handleAdapterSetupRequested()
+{
+    QTC_ASSERT(m_state == Inactive, return);
+
+    m_state = GatheringPorts;
+    m_portsGatherer->start(m_device);
+}
+
+void QnxAbstractRunSupport::handlePortListReady()
+{
+    QTC_ASSERT(m_state == GatheringPorts, return);
+    m_portList = m_device->freePorts();
+    startExecution();
+}
+
+void QnxAbstractRunSupport::handleRemoteProcessStarted()
+{
+    m_state = Running;
+}
+
+void QnxAbstractRunSupport::handleRemoteProcessFinished(bool)
+{
+}
+
+void QnxAbstractRunSupport::setFinished()
+{
+    if (m_state != GatheringPorts && m_state != Inactive)
+        m_runner->stop(m_device->processSupport()->killProcessByNameCommandLine(executable()).toUtf8());
+
+    m_state = Inactive;
+}
+
+QnxAbstractRunSupport::State QnxAbstractRunSupport::state() const
+{
+    return m_state;
+}
+
+void QnxAbstractRunSupport::setState(QnxAbstractRunSupport::State state)
+{
+    m_state = state;
+}
+
+DeviceApplicationRunner *QnxAbstractRunSupport::appRunner() const
+{
+    return m_runner;
+}
+
+QString QnxAbstractRunSupport::commandPrefix() const
+{
+    return m_commandPrefix;
+}
+
+const IDevice::ConstPtr QnxAbstractRunSupport::device() const
+{
+    return m_device;
+}
+
+void QnxAbstractRunSupport::handleProgressReport(const QString &)
+{
+}
+
+void QnxAbstractRunSupport::handleRemoteOutput(const QByteArray &)
+{
+}
+
+void QnxAbstractRunSupport::handleError(const QString &)
+{
+}
+
+bool QnxAbstractRunSupport::setPort(int &port)
+{
+    port = m_portsGatherer->getNextFreePort(&m_portList);
+    if (port == -1) {
+        handleError(tr("Not enough free ports on device for debugging."));
+        return false;
+    }
+    return true;
+}
+
+QString QnxAbstractRunSupport::executable() const
+{
+    return m_remoteExecutable;
+}

src/plugins/qnx/qnxabstractrunsupport.h

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 QNXABSTRACTRUNSUPPORT_H
+#define QNXABSTRACTRUNSUPPORT_H
+
+#include <projectexplorer/devicesupport/idevice.h>
+#include <utils/portlist.h>
+
+#include <QObject>
+#include <QString>
+
+namespace ProjectExplorer {
+class DeviceApplicationRunner;
+class DeviceUsedPortsGatherer;
+}
+
+namespace Qnx {
+namespace Internal {
+
+class QnxRunConfiguration;
+
+class QnxAbstractRunSupport : public QObject
+{
+    Q_OBJECT
+protected:
+    enum State {
+        Inactive,
+        GatheringPorts,
+        StartingRemoteProcess,
+        Running
+    };
+public:
+    QnxAbstractRunSupport(QnxRunConfiguration *runConfig, QObject *parent = 0);
+
+protected:
+    bool setPort(int &port);
+    virtual void startExecution() = 0;
+
+    virtual QString executable() const;
+
+    void setFinished();
+
+    State state() const;
+    void setState(State state);
+
+    ProjectExplorer::DeviceApplicationRunner *appRunner() const;
+    QString commandPrefix() const;
+    const ProjectExplorer::IDevice::ConstPtr device() const;
+
+protected slots:
+    virtual void handleAdapterSetupRequested();
+
+    virtual void handleRemoteProcessStarted();
+    virtual void handleRemoteProcessFinished(bool);
+    virtual void handleProgressReport(const QString &progressOutput);
+    virtual void handleRemoteOutput(const QByteArray &output);
+    virtual void handleError(const QString &);
+
+private slots:
+    void handlePortListReady();
+
+private:
+    ProjectExplorer::DeviceUsedPortsGatherer * m_portsGatherer;
+    Utils::PortList m_portList;
+    const QString m_remoteExecutable;
+    const QString m_commandPrefix;
+    ProjectExplorer::IDevice::ConstPtr m_device;
+    ProjectExplorer::DeviceApplicationRunner *m_runner;
+    State m_state;
+};
+
+} // namespace Internal
+} // namespace Qnx
+
+#endif // QNXABSTRACTRUNSUPPORT_H

src/plugins/qnx/qnxanalyzesupport.cpp

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 "qnxanalyzesupport.h"
+
+#include <analyzerbase/ianalyzerengine.h>
+#include <analyzerbase/analyzerstartparameters.h>
+#include <projectexplorer/devicesupport/deviceapplicationrunner.h>
+
+#include <utils/qtcassert.h>
+
+using namespace ProjectExplorer;
+
+using namespace Qnx;
+using namespace Qnx::Internal;
+
+QnxAnalyzeSupport::QnxAnalyzeSupport(QnxRunConfiguration *runConfig,
+                                     Analyzer::IAnalyzerEngine *engine)
+    : QnxAbstractRunSupport(runConfig, engine)
+    , m_engine(engine)
+    , m_qmlPort(-1)
+{
+    const DeviceApplicationRunner *runner = appRunner();
+    connect(runner, SIGNAL(reportError(QString)), SLOT(handleError(QString)));
+    connect(runner, SIGNAL(remoteProcessStarted()), SLOT(handleRemoteProcessStarted()));
+    connect(runner, SIGNAL(finished(bool)), SLOT(handleRemoteProcessFinished(bool)));
+    connect(runner, SIGNAL(reportProgress(QString)), SLOT(handleProgressReport(QString)));
+    connect(runner, SIGNAL(remoteStdout(QByteArray)), SLOT(handleRemoteOutput(QByteArray)));
+    connect(runner, SIGNAL(remoteStderr(QByteArray)), SLOT(handleRemoteOutput(QByteArray)));
+
+    connect(m_engine, SIGNAL(starting(const Analyzer::IAnalyzerEngine*)),
+            SLOT(handleAdapterSetupRequested()));
+}
+
+void QnxAnalyzeSupport::handleAdapterSetupRequested()
+{
+    QTC_ASSERT(state() == Inactive, return);
+
+    showMessage(tr("Preparing remote side...\n"), Utils::NormalMessageFormat);
+    QnxAbstractRunSupport::handleAdapterSetupRequested();
+}
+
+void QnxAnalyzeSupport::startExecution()
+{
+    if (state() == Inactive)
+        return;
+
+    if (!setPort(m_qmlPort) && m_qmlPort == -1)
+        return;
+
+    setState(StartingRemoteProcess);
+
+    const QString args = m_engine->startParameters().debuggeeArgs +
+            QString::fromLatin1(" -qmljsdebugger=port:%1,block").arg(m_qmlPort);
+    const QString command = QString::fromLatin1("%1 %2 %3").arg(commandPrefix(), executable(), args);
+    appRunner()->start(device(), command.toUtf8());
+}
+
+void QnxAnalyzeSupport::handleRemoteProcessStarted()
+{
+    QnxAbstractRunSupport::handleRemoteProcessStarted();
+    if (m_engine)
+        m_engine->notifyRemoteSetupDone(m_qmlPort);
+}
+
+void QnxAnalyzeSupport::handleRemoteProcessFinished(bool success)
+{
+    if (m_engine || state() == Inactive)
+        return;
+
+    if (!success)
+        showMessage(tr("The %1 process closed unexpectedly.").arg(executable()),
+                    Utils::NormalMessageFormat);
+    m_engine->notifyRemoteFinished(success);
+}
+
+void QnxAnalyzeSupport::handleProfilingFinished()
+{
+    setFinished();
+}
+
+void QnxAnalyzeSupport::handleProgressReport(const QString &progressOutput)
+{
+    showMessage(progressOutput + QLatin1Char('\n'), Utils::NormalMessageFormat);
+}
+
+void QnxAnalyzeSupport::handleRemoteOutput(const QByteArray &output)
+{
+    QTC_ASSERT(state() == Inactive || state() == Running, return);
+
+    showMessage(QString::fromUtf8(output), Utils::StdOutFormat);
+}
+
+void QnxAnalyzeSupport::handleError(const QString &error)
+{
+    if (state() == Running) {
+        showMessage(error, Utils::ErrorMessageFormat);
+    } else if (state() != Inactive) {
+        showMessage(tr("Initial setup failed: %1").arg(error), Utils::NormalMessageFormat);
+        setFinished();
+    }
+}
+
+void QnxAnalyzeSupport::showMessage(const QString &msg, Utils::OutputFormat format)
+{
+    if (state() != Inactive && m_engine)
+        m_engine->logApplicationMessage(msg, format);
+}

src/plugins/qnx/qnxanalyzesupport.h

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 QNXANALYZESUPPORT_H
+#define QNXANALYZESUPPORT_H
+
+#include "qnxabstractrunsupport.h"
+
+#include <projectexplorer/projectexplorerconstants.h>
+#include <utils/outputformat.h>
+
+namespace Analyzer { class IAnalyzerEngine; }
+
+namespace Qnx {
+namespace Internal {
+
+class QnxRunConfiguration;
+
+class QnxAnalyzeSupport : public QnxAbstractRunSupport
+{
+    Q_OBJECT
+public:
+    QnxAnalyzeSupport(QnxRunConfiguration *runConfig, Analyzer::IAnalyzerEngine *engine);
+
+public slots:
+    void handleProfilingFinished();
+
+private slots:
+    void handleAdapterSetupRequested();
+
+    void handleRemoteProcessStarted();
+    void handleRemoteProcessFinished(bool success);
+    void handleProgressReport(const QString &progressOutput);
+    void handleRemoteOutput(const QByteArray &output);
+    void handleError(const QString &error);
+
+private:
+    void startExecution();
+    void showMessage(const QString &, Utils::OutputFormat);
+
+    Analyzer::IAnalyzerEngine *m_engine;
+    int m_qmlPort;
+};
+
+} // namespace Internal
+} // namespace Qnx
+
+#endif // QNXANALYZESUPPORT_H

src/plugins/qnx/qnxdebugsupport.cpp

@@ -40,7 +40,6 @@
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
@@ -50,66 +49,44 @@ using namespace Qnx;
 using namespace Qnx::Internal;
 
 QnxDebugSupport::QnxDebugSupport(QnxRunConfiguration *runConfig, Debugger::DebuggerEngine *engine)
-    : QObject(engine)
-    , m_remoteExecutable(runConfig->remoteExecutableFilePath())
-    , m_commandPrefix(runConfig->commandPrefix())
-    , m_device(DeviceKitInformation::device(runConfig->target()->kit()))
+    : QnxAbstractRunSupport(runConfig, engine)
     , m_engine(engine)
     , m_pdebugPort(-1)
     , m_qmlPort(-1)
     , m_useCppDebugger(runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>()->useCppDebugger())
     , m_useQmlDebugger(runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>()->useQmlDebugger())
-    , m_state(Inactive)
 {
-    m_runner = new DeviceApplicationRunner(this);
-    m_portsGatherer = new DeviceUsedPortsGatherer(this);
-
-    connect(m_portsGatherer, SIGNAL(error(QString)), SLOT(handleError(QString)));
-    connect(m_portsGatherer, SIGNAL(portListReady()), SLOT(handlePortListReady()));
-
-    connect(m_runner, SIGNAL(reportError(QString)), SLOT(handleError(QString)));
-    connect(m_runner, SIGNAL(remoteProcessStarted()),        this, SLOT(handleRemoteProcessStarted()));
-    connect(m_runner, SIGNAL(finished(bool)), SLOT(handleRemoteProcessFinished(bool)));
-    connect(m_runner, SIGNAL(reportProgress(QString)),       this, SLOT(handleProgressReport(QString)));
-    connect(m_runner, SIGNAL(remoteStdout(QByteArray)),      this, SLOT(handleRemoteOutput(QByteArray)));
-    connect(m_runner, SIGNAL(remoteStderr(QByteArray)),     this, SLOT(handleRemoteOutput(QByteArray)));
+    const DeviceApplicationRunner *runner = appRunner();
+    connect(runner, SIGNAL(reportError(QString)), SLOT(handleError(QString)));
+    connect(runner, SIGNAL(remoteProcessStarted()), SLOT(handleRemoteProcessStarted()));
+    connect(runner, SIGNAL(finished(bool)), SLOT(handleRemoteProcessFinished(bool)));
+    connect(runner, SIGNAL(reportProgress(QString)), SLOT(handleProgressReport(QString)));
+    connect(runner, SIGNAL(remoteStdout(QByteArray)), SLOT(handleRemoteOutput(QByteArray)));
+    connect(runner, SIGNAL(remoteStderr(QByteArray)), SLOT(handleRemoteOutput(QByteArray)));
 
     connect(m_engine, SIGNAL(requestRemoteSetup()), this, SLOT(handleAdapterSetupRequested()));
 }
 
 void QnxDebugSupport::handleAdapterSetupRequested()
 {
-    QTC_ASSERT(m_state == Inactive, return);
+    QTC_ASSERT(state() == Inactive, return);
 
-    m_state = GatheringPorts;
     if (m_engine)
         m_engine->showMessage(tr("Preparing remote side...\n"), Debugger::AppStuff);
-    m_portsGatherer->start(m_device);
-}
-
-void QnxDebugSupport::handlePortListReady()
-{
-    QTC_ASSERT(m_state == GatheringPorts, return);
-    startExecution();
+    QnxAbstractRunSupport::handleAdapterSetupRequested();
 }
 
 void QnxDebugSupport::startExecution()
 {
-    if (m_state == Inactive)
+    if (state() == Inactive)
         return;
 
-    Utils::PortList portList = m_device->freePorts();
-    if (m_useCppDebugger)
-        m_pdebugPort = m_portsGatherer->getNextFreePort(&portList);
-    if (m_useQmlDebugger)
-        m_qmlPort = m_portsGatherer->getNextFreePort(&portList);