analyzer: merge start and startRemote partially

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

src/plugins/valgrind/callgrind/callgrindrunner.cpp

@@ -76,12 +76,6 @@ void CallgrindRunner::start()
     m_controller->setValgrindProcess(valgrindProcess());
 }
 
-void CallgrindRunner::startRemotely(const Utils::SshConnectionParameters &sshParams)
-{
-    ValgrindRunner::startRemotely(sshParams);
-    m_controller->setValgrindProcess(valgrindProcess());
-}
-
 void CallgrindRunner::processFinished(int ret, QProcess::ExitStatus status)
 {
     triggerParse();

src/plugins/valgrind/callgrind/callgrindrunner.h

@@ -55,9 +55,7 @@ public:
     CallgrindController *controller() const;
 
     bool isPaused() const;
-
-    virtual void start();
-    virtual void startRemotely(const Utils::SshConnectionParameters &sshParams);
+    void start();
 
 signals:
     void statusMessage(const QString &message);

src/plugins/valgrind/memcheck/memcheckrunner.cpp

@@ -98,6 +98,7 @@ void MemcheckRunner::setParser(XmlProtocol::ThreadedParser *parser)
 
 void MemcheckRunner::start()
 {
+    if (startMode() == Analyzer::StartLocal) {
         QTC_ASSERT(d->parser, return);
 
         bool check = d->xmlServer.listen(QHostAddress(QHostAddress::LocalHost));
@@ -119,12 +120,9 @@ void MemcheckRunner::start()
                           << QString("--log-socket=127.0.0.1:%1").arg(QString::number(logPortNumber))
                           << valgrindArguments();
         setValgrindArguments(memcheckArguments);
-
-    ValgrindRunner::start();
     }
 
-void MemcheckRunner::startRemotely(const Utils::SshConnectionParameters &sshParams)
-{
+    if (startMode() == Analyzer::StartRemote) {
         QTC_ASSERT(d->parser, return);
 
         QList<QHostAddress> possibleHostAddresses;
@@ -204,8 +202,9 @@ void MemcheckRunner::startRemotely(const Utils::SshConnectionParameters &sshPara
                           << QString("--child-silent-after-fork=yes")
                           << QString("--log-socket=%1:%2").arg(ip, QString::number(logPortNumber));
         setValgrindArguments(memcheckArguments);
+    }
 
-    ValgrindRunner::startRemotely(sshParams);
+    ValgrindRunner::start();
 }
 
 void MemcheckRunner::xmlSocketConnected()

src/plugins/valgrind/memcheck/memcheckrunner.h

@@ -54,9 +54,7 @@ public:
     ~MemcheckRunner();
 
     void setParser(XmlProtocol::ThreadedParser *parser);
-
     void start();
-    void startRemotely(const Utils::SshConnectionParameters &sshParams);
 
 signals:
     void logMessageReceived(const QByteArray &);

src/plugins/valgrind/valgrindengine.cpp

@@ -103,6 +103,8 @@ bool ValgrindEngine::start()
     runner()->setDebuggeeExecutable(sp.debuggee);
     runner()->setDebuggeeArguments(sp.debuggeeArgs);
     runner()->setEnvironment(sp.environment);
+    runner()->setConnectionParameters(sp.connParams);
+    runner()->setStartMode(sp.startMode);
 
     connect(runner(), SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)),
             SLOT(receiveProcessOutput(QByteArray,Utils::OutputFormat)));
@@ -111,9 +113,6 @@ bool ValgrindEngine::start()
     connect(runner(), SIGNAL(finished()),
             SLOT(runnerFinished()));
 
-    if (sp.startMode == StartRemote)
-        runner()->startRemotely(sp.connParams);
-    else
     runner()->start();
 
     return true;

src/plugins/valgrind/valgrindrunner.cpp

@@ -52,7 +52,9 @@ public:
         : q(qq),
           process(0),
           channelMode(QProcess::SeparateChannels),
-          finished(false)
+          finished(false),
+          startMode(Analyzer::StartLocal),
+          connParams(Utils::SshConnectionParameters::DefaultProxy)
     {
     }
 
@@ -68,6 +70,8 @@ public:
     QString debuggeeExecutable;
     QString debuggeeArguments;
     QString workingdir;
+    Analyzer::StartMode startMode;
+    Utils::SshConnectionParameters connParams;
 };
 
 void ValgrindRunner::Private::run(ValgrindProcess *_process)
@@ -165,6 +169,26 @@ void ValgrindRunner::setDebuggeeArguments(const QString &arguments)
     d->debuggeeArguments = arguments;
 }
 
+Analyzer::StartMode ValgrindRunner::startMode() const
+{
+    return d->startMode;
+}
+
+void ValgrindRunner::setStartMode(Analyzer::StartMode startMode)
+{
+    d->startMode = startMode;
+}
+
+const Utils::SshConnectionParameters &ValgrindRunner::connectionParameters() const
+{
+    return d->connParams;
+}
+
+void ValgrindRunner::setConnectionParameters(const Utils::SshConnectionParameters &connParams)
+{
+    d->connParams = connParams;
+}
+
 void ValgrindRunner::setWorkingDirectory(const QString &path)
 {
     d->workingdir = path;
@@ -197,12 +221,10 @@ void ValgrindRunner::waitForFinished() const
 
 void ValgrindRunner::start()
 {
+    if (d->startMode == Analyzer::StartLocal)
         d->run(new LocalValgrindProcess(this));
-}
-
-void ValgrindRunner::startRemotely(const Utils::SshConnectionParameters &sshParams)
-{
-    d->run(new RemoteValgrindProcess(sshParams, this));
+    else if (d->startMode == Analyzer::StartRemote)
+        d->run(new RemoteValgrindProcess(d->connParams, this));
 }
 
 void ValgrindRunner::processError(QProcess::ProcessError e)

src/plugins/valgrind/valgrindrunner.h

@@ -35,8 +35,12 @@
 #ifndef VALGRIND_RUNNER_H
 #define VALGRIND_RUNNER_H
 
-#include <QtCore/QProcess>
+#include "analyzerconstants.h"
+
 #include <utils/outputformat.h>
+#include <utils/ssh/sshconnection.h>
+
+#include <QtCore/QProcess>
 
 namespace Utils {
 class Environment;
@@ -69,13 +73,17 @@ public:
     void setEnvironment(const Utils::Environment &environment);
     void setProcessChannelMode(QProcess::ProcessChannelMode mode);
 
+    void setStartMode(Analyzer::StartMode startMode);
+    Analyzer::StartMode startMode() const;
+
+    void setConnectionParameters(const Utils::SshConnectionParameters &connParams);
+    const Utils::SshConnectionParameters &connectionParameters() const;
+
     void waitForFinished() const;
 
     QString errorString() const;
 
     virtual void start();
-    virtual void startRemotely(const Utils::SshConnectionParameters &sshParams);
-
     virtual void stop();
 
     ValgrindProcess *valgrindProcess() const;