forked from qt-creator/qt-creator
RemoteLinux: More untangling of generic and Maemo-specific stuff.
- Make key deployment a device type dependent action. - Split up monolithic device configuration wizard. - Split up run configurations, run controls and the associated factories. Change-Id: Ib2ef9d405e6b7eaae89fc27c56e3c327829a88f7 Reviewed-on: http://codereview.qt.nokia.com/486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Christian Kandeler
@@ -31,259 +31,22 @@
|
||||
|
||||
#include "maemodebugsupport.h"
|
||||
|
||||
#include "maemodeployables.h"
|
||||
#include "maemoglobal.h"
|
||||
#include "maemosshrunner.h"
|
||||
#include "maemousedportsgatherer.h"
|
||||
#include "qt4maemotarget.h"
|
||||
|
||||
#include <debugger/debuggerplugin.h>
|
||||
#include <debugger/debuggerstartparameters.h>
|
||||
#include <debugger/debuggerrunner.h>
|
||||
#include <debugger/debuggerengine.h>
|
||||
#include <projectexplorer/abi.h>
|
||||
#include <projectexplorer/toolchain.h>
|
||||
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
|
||||
|
||||
using namespace Utils;
|
||||
using namespace Debugger;
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
namespace RemoteLinux {
|
||||
namespace Internal {
|
||||
|
||||
RunControl *MaemoDebugSupport::createDebugRunControl(RemoteLinuxRunConfiguration *runConfig)
|
||||
MaemoDebugSupport::MaemoDebugSupport(MaemoRunConfiguration *runConfig, Debugger::DebuggerEngine *engine)
|
||||
: AbstractRemoteLinuxDebugSupport(runConfig, engine),
|
||||
m_runner(new MaemoSshRunner(this, runConfig))
|
||||
{
|
||||
DebuggerStartParameters params;
|
||||
const LinuxDeviceConfiguration::ConstPtr &devConf = runConfig->deviceConfig();
|
||||
|
||||
const RemoteLinuxRunConfiguration::DebuggingType debuggingType
|
||||
= runConfig->debuggingType();
|
||||
if (debuggingType != RemoteLinuxRunConfiguration::DebugCppOnly) {
|
||||
params.qmlServerAddress = runConfig->deviceConfig()->sshParameters().host;
|
||||
params.qmlServerPort = -1;
|
||||
}
|
||||
if (debuggingType != RemoteLinuxRunConfiguration::DebugQmlOnly) {
|
||||
params.processArgs = runConfig->arguments();
|
||||
if (runConfig->activeQt4BuildConfiguration()->qtVersion())
|
||||
params.sysroot = runConfig->activeQt4BuildConfiguration()->qtVersion()->systemRoot();
|
||||
params.toolChainAbi = runConfig->abi();
|
||||
params.startMode = AttachToRemote;
|
||||
params.executable = runConfig->localExecutableFilePath();
|
||||
params.debuggerCommand = runConfig->gdbCmd();
|
||||
params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1");
|
||||
params.useServerStartScript = true;
|
||||
|
||||
// TODO: This functionality should be inside the debugger.
|
||||
const ProjectExplorer::Abi &abi = runConfig->target()
|
||||
->activeBuildConfiguration()->toolChain()->targetAbi();
|
||||
params.remoteArchitecture = abi.toString();
|
||||
params.gnuTarget = QLatin1String(abi.architecture() == ProjectExplorer::Abi::ArmArchitecture
|
||||
? "arm-none-linux-gnueabi": "i386-unknown-linux-gnu");
|
||||
} else {
|
||||
params.startMode = AttachToRemote;
|
||||
}
|
||||
params.displayName = runConfig->displayName();
|
||||
|
||||
if (const ProjectExplorer::Project *project = runConfig->target()->project()) {
|
||||
params.projectSourceDirectory = project->projectDirectory();
|
||||
if (const ProjectExplorer::BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration()) {
|
||||
params.projectBuildDirectory = buildConfig->buildDirectory();
|
||||
}
|
||||
params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles);
|
||||
}
|
||||
|
||||
DebuggerRunControl * const runControl =
|
||||
DebuggerPlugin::createDebugger(params, runConfig);
|
||||
MaemoDebugSupport *debugSupport =
|
||||
new MaemoDebugSupport(runConfig, runControl->engine());
|
||||
connect(runControl, SIGNAL(finished()),
|
||||
debugSupport, SLOT(handleDebuggingFinished()));
|
||||
return runControl;
|
||||
}
|
||||
|
||||
MaemoDebugSupport::MaemoDebugSupport(RemoteLinuxRunConfiguration *runConfig, DebuggerEngine *engine)
|
||||
: QObject(engine), m_engine(engine), m_runConfig(runConfig),
|
||||
m_deviceConfig(m_runConfig->deviceConfig()),
|
||||
m_runner(new MaemoSshRunner(this, runConfig)),
|
||||
m_debuggingType(runConfig->debuggingType()),
|
||||
m_state(Inactive), m_gdbServerPort(-1), m_qmlPort(-1)
|
||||
{
|
||||
connect(m_engine, SIGNAL(requestRemoteSetup()), this,
|
||||
SLOT(handleAdapterSetupRequested()));
|
||||
}
|
||||
|
||||
MaemoDebugSupport::~MaemoDebugSupport()
|
||||
{
|
||||
setState(Inactive);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::showMessage(const QString &msg, int channel)
|
||||
{
|
||||
if (m_engine)
|
||||
m_engine->showMessage(msg, channel);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleAdapterSetupRequested()
|
||||
{
|
||||
ASSERT_STATE(Inactive);
|
||||
|
||||
setState(StartingRunner);
|
||||
showMessage(tr("Preparing remote side ...\n"), AppStuff);
|
||||
disconnect(m_runner, 0, this, 0);
|
||||
connect(m_runner, SIGNAL(error(QString)), this,
|
||||
SLOT(handleSshError(QString)));
|
||||
connect(m_runner, SIGNAL(readyForExecution()), this,
|
||||
SLOT(startExecution()));
|
||||
connect(m_runner, SIGNAL(reportProgress(QString)), this,
|
||||
SLOT(handleProgressReport(QString)));
|
||||
m_runner->start();
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleSshError(const QString &error)
|
||||
{
|
||||
if (m_state == Debugging) {
|
||||
showMessage(error, AppError);
|
||||
if (m_engine)
|
||||
m_engine->notifyInferiorIll();
|
||||
} else if (m_state != Inactive) {
|
||||
handleAdapterSetupFailed(error);
|
||||
}
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::startExecution()
|
||||
{
|
||||
if (m_state == Inactive)
|
||||
return;
|
||||
|
||||
ASSERT_STATE(StartingRunner);
|
||||
|
||||
if (m_debuggingType != RemoteLinuxRunConfiguration::DebugQmlOnly) {
|
||||
if (!setPort(m_gdbServerPort))
|
||||
return;
|
||||
}
|
||||
if (m_debuggingType != RemoteLinuxRunConfiguration::DebugCppOnly) {
|
||||
if (!setPort(m_qmlPort))
|
||||
return;
|
||||
}
|
||||
|
||||
setState(StartingRemoteProcess);
|
||||
m_gdbserverOutput.clear();
|
||||
connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)), this,
|
||||
SLOT(handleRemoteErrorOutput(QByteArray)));
|
||||
connect(m_runner, SIGNAL(remoteOutput(QByteArray)), this,
|
||||
SLOT(handleRemoteOutput(QByteArray)));
|
||||
if (m_debuggingType == RemoteLinuxRunConfiguration::DebugQmlOnly) {
|
||||
connect(m_runner, SIGNAL(remoteProcessStarted()),
|
||||
SLOT(handleRemoteProcessStarted()));
|
||||
}
|
||||
const QString &remoteExe = m_runner->remoteExecutable();
|
||||
QString args = m_runner->arguments();
|
||||
if (m_debuggingType != RemoteLinuxRunConfiguration::DebugCppOnly) {
|
||||
args += QString(QLatin1String(" -qmljsdebugger=port:%1,block"))
|
||||
.arg(m_qmlPort);
|
||||
}
|
||||
|
||||
const QString remoteCommandLine = m_debuggingType == RemoteLinuxRunConfiguration::DebugQmlOnly
|
||||
? QString::fromLocal8Bit("%1 %2 %3").arg(m_runner->commandPrefix()).arg(remoteExe).arg(args)
|
||||
: QString::fromLocal8Bit("%1 gdbserver :%2 %3 %4").arg(m_runner->commandPrefix())
|
||||
.arg(m_gdbServerPort).arg(remoteExe).arg(args);
|
||||
connect(m_runner, SIGNAL(remoteProcessFinished(qint64)),
|
||||
SLOT(handleRemoteProcessFinished(qint64)));
|
||||
m_runner->startExecution(remoteCommandLine.toUtf8());
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleRemoteProcessFinished(qint64 exitCode)
|
||||
{
|
||||
if (!m_engine || m_state == Inactive || exitCode == 0)
|
||||
return;
|
||||
|
||||
if (m_state == Debugging) {
|
||||
if (m_debuggingType != RemoteLinuxRunConfiguration::DebugQmlOnly)
|
||||
m_engine->notifyInferiorIll();
|
||||
} else {
|
||||
const QString errorMsg = m_debuggingType == RemoteLinuxRunConfiguration::DebugQmlOnly
|
||||
? tr("Remote application failed with exit code %1.").arg(exitCode)
|
||||
: tr("The gdbserver process closed unexpectedly.");
|
||||
m_engine->handleRemoteSetupFailed(errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleDebuggingFinished()
|
||||
{
|
||||
setState(Inactive);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleRemoteOutput(const QByteArray &output)
|
||||
{
|
||||
ASSERT_STATE(QList<State>() << Inactive << Debugging);
|
||||
showMessage(QString::fromUtf8(output), AppOutput);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
|
||||
{
|
||||
ASSERT_STATE(QList<State>() << Inactive << StartingRemoteProcess << Debugging);
|
||||
|
||||
if (!m_engine)
|
||||
return;
|
||||
|
||||
showMessage(QString::fromUtf8(output), AppOutput);
|
||||
if (m_state == StartingRemoteProcess
|
||||
&& m_debuggingType != RemoteLinuxRunConfiguration::DebugQmlOnly) {
|
||||
m_gdbserverOutput += output;
|
||||
if (m_gdbserverOutput.contains("Listening on port")) {
|
||||
handleAdapterSetupDone();
|
||||
m_gdbserverOutput.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)
|
||||
{
|
||||
showMessage(progressOutput + QLatin1Char('\n'), AppStuff);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleAdapterSetupFailed(const QString &error)
|
||||
{
|
||||
setState(Inactive);
|
||||
m_engine->handleRemoteSetupFailed(tr("Initial setup failed: %1").arg(error));
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleAdapterSetupDone()
|
||||
{
|
||||
setState(Debugging);
|
||||
m_engine->handleRemoteSetupDone(m_gdbServerPort, m_qmlPort);
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::handleRemoteProcessStarted()
|
||||
{
|
||||
Q_ASSERT(m_debuggingType == RemoteLinuxRunConfiguration::DebugQmlOnly);
|
||||
ASSERT_STATE(StartingRemoteProcess);
|
||||
handleAdapterSetupDone();
|
||||
}
|
||||
|
||||
void MaemoDebugSupport::setState(State newState)
|
||||
{
|
||||
if (m_state == newState)
|
||||
return;
|
||||
m_state = newState;
|
||||
if (m_state == Inactive)
|
||||
m_runner->stop();
|
||||
}
|
||||
|
||||
bool MaemoDebugSupport::setPort(int &port)
|
||||
{
|
||||
port = m_runner->usedPortsGatherer()->getNextFreePort(m_runner->freePorts());
|
||||
if (port == -1) {
|
||||
handleAdapterSetupFailed(tr("Not enough free ports on device for debugging."));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
RemoteLinuxApplicationRunner *MaemoDebugSupport::runner() const { return m_runner; }
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace RemoteLinux
|
||||
|
||||
Reference in New Issue
Block a user