Commit ed148374 authored by hjk's avatar hjk

Debugger: Remove RemoteGdbProcess and RemotePlainGdbAdapter

Should be superseded by using a LocalAdapter variant with
(remote) DeviceProcess.

Change-Id: I9834105ff677bfe5ca527778e9795efc3b677393
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent b00a7f03
......@@ -123,9 +123,7 @@ QtcPlugin {
"localgdbprocess.cpp", "localgdbprocess.h",
"localplaingdbadapter.cpp", "localplaingdbadapter.h",
"pythongdbengine.cpp",
"remotegdbprocess.cpp", "remotegdbprocess.h",
"remotegdbserveradapter.cpp", "remotegdbserveradapter.h",
"remoteplaingdbadapter.cpp", "remoteplaingdbadapter.h",
"startgdbserverdialog.cpp", "startgdbserverdialog.h",
"termgdbadapter.cpp", "termgdbadapter.h"
]
......
......@@ -8,8 +8,6 @@ HEADERS += \
$$PWD/remotegdbserveradapter.h \
$$PWD/abstractgdbprocess.h \
$$PWD/localgdbprocess.h \
$$PWD/remotegdbprocess.h \
$$PWD/remoteplaingdbadapter.h \
$$PWD/abstractplaingdbadapter.h \
$$PWD/startgdbserverdialog.h
......@@ -25,8 +23,6 @@ SOURCES += \
$$PWD/remotegdbserveradapter.cpp \
$$PWD/abstractgdbprocess.cpp \
$$PWD/localgdbprocess.cpp \
$$PWD/remotegdbprocess.cpp \
$$PWD/remoteplaingdbadapter.cpp \
$$PWD/abstractplaingdbadapter.cpp \
$$PWD/startgdbserverdialog.cpp
......
......@@ -34,7 +34,6 @@
#include "localplaingdbadapter.h"
#include "termgdbadapter.h"
#include "remotegdbserveradapter.h"
#include "remoteplaingdbadapter.h"
#include "gdboptionspage.h"
......@@ -5460,8 +5459,6 @@ DebuggerEngine *createGdbEngine(const DebuggerStartParameters &sp)
case StartRemoteProcess:
case AttachToRemoteServer:
return new GdbRemoteServerEngine(sp);
case StartRemoteGdb:
return new GdbRemotePlainEngine(sp);
case AttachExternal:
return new GdbAttachEngine(sp);
default:
......
This diff is collapsed.
/****************************************************************************
**
** 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 REMOTEGDBPROCESS_H
#define REMOTEGDBPROCESS_H
#include "abstractgdbprocess.h"
#include <ssh/sshconnection.h>
#include <ssh/sshremoteprocess.h>
#include <QQueue>
namespace Debugger {
namespace Internal {
class GdbRemotePlainEngine;
class RemoteGdbProcess : public AbstractGdbProcess
{
Q_OBJECT
public:
RemoteGdbProcess(const QSsh::SshConnectionParameters &server,
GdbRemotePlainEngine *adapter, QObject *parent = 0);
virtual QByteArray readAllStandardOutput();
virtual QByteArray readAllStandardError();
virtual void start(const QString &cmd, const QStringList &args);
virtual bool waitForStarted();
virtual qint64 write(const QByteArray &data);
virtual void kill();
virtual bool interrupt();
virtual QProcess::ProcessState state() const;
virtual QString errorString() const;
virtual QProcessEnvironment processEnvironment() const;
virtual void setProcessEnvironment(const QProcessEnvironment &env);
virtual void setEnvironment(const QStringList &env);
virtual void setWorkingDirectory(const QString &dir);
void interruptInferior();
void realStart(const QString &cmd, const QStringList &args,
const QString &executableFilePath);
static const QByteArray CtrlC;
signals:
void started();
void startFailed();
private slots:
void handleConnected();
void handleConnectionError();
void handleFifoCreationFinished(int exitStatus);
void handleAppOutputReaderStarted();
void handleAppOutputReaderFinished(int exitStatus);
void handleGdbStarted();
void handleGdbFinished(int exitStatus);
void handleGdbOutput();
void handleAppOutput();
void handleErrOutput();
private:
enum State {
Inactive, Connecting, CreatingFifo, StartingFifoReader,
StartingGdb, RunningGdb
};
static QByteArray readerCmdLine(const QByteArray &file);
int findAnchor(const QByteArray &data) const;
void sendInput(const QByteArray &data);
QByteArray removeCarriageReturn(const QByteArray &data);
void emitErrorExit(const QString &error);
void setState(State newState);
QSsh::SshConnectionParameters m_connParams;
QSsh::SshConnection *m_conn;
QSsh::SshRemoteProcess::Ptr m_gdbProc;
QSsh::SshRemoteProcess::Ptr m_appOutputReader;
QSsh::SshRemoteProcess::Ptr m_fifoCreator;
QByteArray m_gdbOutput;
QByteArray m_errorOutput;
QString m_command;
QStringList m_cmdArgs;
QString m_wd;
QQueue<QByteArray> m_inputToSend;
QByteArray m_currentGdbOutput;
QByteArray m_lastSeqNr;
QString m_error;
QByteArray m_appOutputFileName;
State m_state;
GdbRemotePlainEngine *m_adapter;
};
} // namespace Internal
} // namespace Debugger
#endif // REMOTEGDBPROCESS_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.
**
****************************************************************************/
#include "remoteplaingdbadapter.h"
#include <debugger/debuggerstartparameters.h>
#include <utils/qtcassert.h>
namespace Debugger {
namespace Internal {
GdbRemotePlainEngine::GdbRemotePlainEngine(const DebuggerStartParameters &startParameters)
: GdbAbstractPlainEngine(startParameters),
m_gdbProc(startParameters.connParams, this)
{
connect(&m_gdbProc, SIGNAL(started()), this, SLOT(handleGdbStarted()));
connect(&m_gdbProc, SIGNAL(startFailed()), this,
SLOT(handleGdbStartFailed1()));
}
void GdbRemotePlainEngine::setupEngine()
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(QLatin1String("TRYING TO START ADAPTER"));
if (!startParameters().workingDirectory.isEmpty())
m_gdbProc.setWorkingDirectory(startParameters().workingDirectory);
if (startParameters().environment.size())
m_gdbProc.setEnvironment(startParameters().environment.toStringList());
notifyEngineRemoteSetupDone(startParameters().connParams.port, startParameters().qmlServerPort);
}
void GdbRemotePlainEngine::setupInferior()
{
GdbAbstractPlainEngine::setupInferior();
postCommand("directory " + startParameters().remoteSourcesDir);
}
void GdbRemotePlainEngine::interruptInferior2()
{
m_gdbProc.interruptInferior();
}
QByteArray GdbRemotePlainEngine::execFilePath() const
{
return startParameters().executable.toUtf8();
}
QByteArray GdbRemotePlainEngine::toLocalEncoding(const QString &s) const
{
return s.toUtf8();
}
QString GdbRemotePlainEngine::fromLocalEncoding(const QByteArray &b) const
{
return QString::fromUtf8(b);
}
void GdbRemotePlainEngine::handleApplicationOutput(const QByteArray &output)
{
showMessage(QString::fromUtf8(output), AppOutput);
}
void GdbRemotePlainEngine::shutdownEngine()
{
notifyAdapterShutdownOk();
}
void GdbRemotePlainEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
{
Q_UNUSED(gdbServerPort);
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
DebuggerStartParameters &sp = startParameters();
if (qmlPort != -1)
sp.qmlServerPort = qmlPort;
m_gdbProc.realStart(sp.debuggerCommand,
QStringList() << QLatin1String("-i") << QLatin1String("mi"),
sp.executable);
}
void GdbRemotePlainEngine::handleGdbStarted()
{
startGdb();
}
void GdbRemotePlainEngine::handleGdbStartFailed1()
{
handleAdapterStartFailed(m_gdbProc.errorString());
}
void GdbRemotePlainEngine::notifyEngineRemoteSetupFailed(const QString &reason)
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
handleAdapterStartFailed(reason);
}
} // namespace Internal
} // namespace Debugger
/****************************************************************************
**
** 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 REMOTEPLAINGDBADAPTER_H
#define REMOTEPLAINGDBADAPTER_H
#include "abstractplaingdbadapter.h"
#include "remotegdbprocess.h"
namespace Debugger {
namespace Internal {
class GdbRemotePlainEngine : public GdbAbstractPlainEngine
{
Q_OBJECT
public:
friend class RemoteGdbProcess;
explicit GdbRemotePlainEngine(const DebuggerStartParameters &startParameters);
private slots:
void handleGdbStarted();
void handleGdbStartFailed1();
private:
void setupEngine();
void setupInferior();
void interruptInferior2();
void shutdownEngine();
void notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort);
void notifyEngineRemoteSetupFailed(const QString &reason);
AbstractGdbProcess *gdbProc() { return &m_gdbProc; }
DumperHandling dumperHandling() const { return DumperLoadedByGdbPreload; }
QByteArray execFilePath() const;
QByteArray toLocalEncoding(const QString &s) const;
QString fromLocalEncoding(const QByteArray &b) const;
void handleApplicationOutput(const QByteArray &output);
RemoteGdbProcess m_gdbProc;
};
} // namespace Internal
} // namespace Debugger
#endif // REMOTEPLAINGDBADAPTER_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