diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri index ddd47c88b13e120e395683b0f632e02266f105a8..e7763cecb6f939efe2862d7bb3cc3adada4438d7 100644 --- a/src/plugins/debugger/gdb/gdb.pri +++ b/src/plugins/debugger/gdb/gdb.pri @@ -16,6 +16,7 @@ HEADERS += \ $$PWD/attachgdbadapter.h \ $$PWD/coregdbadapter.h \ $$PWD/plaingdbadapter.h \ + $$PWD/termgdbadapter.h \ $$PWD/remotegdbadapter.h \ $$PWD/trkgdbadapter.h \ @@ -30,6 +31,7 @@ SOURCES += \ $$PWD/attachgdbadapter.cpp \ $$PWD/coregdbadapter.cpp \ $$PWD/plaingdbadapter.cpp \ + $$PWD/termgdbadapter.cpp \ $$PWD/remotegdbadapter.cpp \ $$PWD/trkgdbadapter.cpp \ diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 87024f56ea7be4dd896828685e05680645096f46..06ad383cc28a09e8bbcea2e47a73198374e91c6b 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -37,6 +37,7 @@ #include "attachgdbadapter.h" #include "coregdbadapter.h" #include "plaingdbadapter.h" +#include "termgdbadapter.h" #include "remotegdbadapter.h" #include "trkgdbadapter.h" @@ -1498,6 +1499,8 @@ AbstractGdbAdapter *GdbEngine::createAdapter(const DebuggerStartParametersPtr &s case AttachExternal: return new AttachGdbAdapter(this); default: + if (sp->useTerminal) + return new TermGdbAdapter(this); return new PlainGdbAdapter(this); } } @@ -4369,7 +4372,8 @@ void GdbEngine::handleAdapterCrashed(const QString &msg) // No point in being friendly here ... m_gdbProc.terminate(); - showMessageBox(QMessageBox::Critical, tr("Adapter crashed"), msg); + if (!msg.isEmpty()) + showMessageBox(QMessageBox::Critical, tr("Adapter crashed"), msg); } void GdbEngine::addOptionPages(QList *opts) const diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index 94e91e4669a8451d61f63c961beb4fb02cf98477..a891a557472fe80b30fa780b10eec5cbd9f1348f 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -92,6 +92,7 @@ private: friend class AttachGdbAdapter; friend class CoreGdbAdapter; friend class PlainGdbAdapter; + friend class TermGdbAdapter; friend class RemoteGdbAdapter; friend class TrkGdbAdapter; diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c3ab45551ebe8e5f60c09101978f592690f4c0e4 --- /dev/null +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -0,0 +1,163 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** Commercial Usage +** +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://qt.nokia.com/contact. +** +**************************************************************************/ + +#include "termgdbadapter.h" + +#include "debuggeractions.h" +#include "gdbengine.h" +#include "procinterrupt.h" +#include "debuggerstringutils.h" + +#include +#include +#include + +#include +#include +#include + +namespace Debugger { +namespace Internal { + +#define CB(callback) \ + static_cast(&TermGdbAdapter::callback), \ + STRINGIFY(callback) + +/////////////////////////////////////////////////////////////////////// +// +// TermGdbAdapter +// +/////////////////////////////////////////////////////////////////////// + +TermGdbAdapter::TermGdbAdapter(GdbEngine *engine, QObject *parent) + : AbstractGdbAdapter(engine, parent) +{ + m_stubProc.setMode(Utils::ConsoleProcess::Debug); +#ifdef Q_OS_UNIX + m_stubProc.setSettings(Core::ICore::instance()->settings()); +#endif + + connect(&m_stubProc, SIGNAL(processError(QString)), SLOT(stubError(QString))); + connect(&m_stubProc, SIGNAL(processStarted()), SLOT(handleInferiorStarted())); + connect(&m_stubProc, SIGNAL(wrapperStopped()), SLOT(stubExited())); +} + +TermGdbAdapter::~TermGdbAdapter() +{ + m_stubProc.disconnect(); // Avoid spurious state transitions from late exiting stub +} + +void TermGdbAdapter::startAdapter() +{ + QTC_ASSERT(state() == EngineStarting, qDebug() << state()); + setState(AdapterStarting); + debugMessage(_("TRYING TO START ADAPTER")); + +// Currently, adapters are not re-used +// // We leave the console open, so recycle it now. +// m_stubProc.blockSignals(true); +// m_stubProc.stop(); +// m_stubProc.blockSignals(false); + + m_stubProc.setWorkingDirectory(startParameters().workingDir); + m_stubProc.setEnvironment(startParameters().environment); + // FIXME: Starting the stub implies starting the inferior. This is + // fairly unclean as far as the state machine and error reporting go. + if (!m_stubProc.start(startParameters().executable, + startParameters().processArgs)) { + // Error message for user is delivered via a signal. + emit adapterStartFailed(QString(), QString()); + return; + } + + if (!m_engine->startGdb()) { + m_stubProc.stop(); + return; + } +} + +void TermGdbAdapter::handleInferiorStarted() +{ + QTC_ASSERT(state() == AdapterStarting, qDebug() << state()); + emit adapterStarted(); +} + +void TermGdbAdapter::startInferior() +{ + QTC_ASSERT(state() == InferiorStarting, qDebug() << state()); + const qint64 attachedPID = m_stubProc.applicationPID(); + m_engine->handleInferiorPidChanged(attachedPID); + m_engine->postCommand(_("attach %1").arg(attachedPID), CB(handleStubAttached)); +} + +void TermGdbAdapter::handleStubAttached(const GdbResponse &response) +{ + if (response.resultClass == GdbResultDone) { + QTC_ASSERT(state() == InferiorStopped, qDebug() << state()); + debugMessage(_("INFERIOR ATTACHED")); + emit inferiorPrepared(); + } else if (response.resultClass == GdbResultError) { + QString msg = _(response.data.findChild("msg").data()); + emit inferiorStartFailed(msg); + } +} + +void TermGdbAdapter::startInferiorPhase2() +{ + setState(InferiorRunningRequested); + m_engine->postCommand(_("-exec-continue"), GdbEngine::RunRequest); +} + +void TermGdbAdapter::interruptInferior() +{ + debugMessage(_("TRYING TO INTERUPT INFERIOR")); + const qint64 attachedPID = m_engine->inferiorPid(); + if (!interruptProcess(attachedPID)) + debugMessage(_("CANNOT INTERRUPT %1").arg(attachedPID)); +} + +void TermGdbAdapter::shutdown() +{ +} + +void TermGdbAdapter::stubError(const QString &msg) +{ + QMessageBox::critical(m_engine->mainWindow(), tr("Debugger Error"), msg); +} + +void TermGdbAdapter::stubExited() +{ + debugMessage(_("STUB EXITED")); + if (state() != AdapterStarting // From previous instance + && state() != EngineShuttingDown && state() != DebuggerNotReady) + emit adapterCrashed(QString()); +} + +} // namespace Internal +} // namespace Debugger diff --git a/src/plugins/debugger/gdb/termgdbadapter.h b/src/plugins/debugger/gdb/termgdbadapter.h new file mode 100644 index 0000000000000000000000000000000000000000..1d774c345bbe25683ed1a7c602c1263789a41000 --- /dev/null +++ b/src/plugins/debugger/gdb/termgdbadapter.h @@ -0,0 +1,80 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** Commercial Usage +** +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://qt.nokia.com/contact. +** +**************************************************************************/ + +#ifndef DEBUGGER_TERMGDBADAPTER_H +#define DEBUGGER_TERMGDBADAPTER_H + +#include "abstractgdbadapter.h" +#include "gdbengine.h" + +#include + +#include +#include + +namespace Debugger { +namespace Internal { + +/////////////////////////////////////////////////////////////////////// +// +// TermGdbAdapter +// +/////////////////////////////////////////////////////////////////////// + +class TermGdbAdapter : public AbstractGdbAdapter +{ + Q_OBJECT + +public: + TermGdbAdapter(GdbEngine *engine, QObject *parent = 0); + ~TermGdbAdapter(); + + bool dumpersAvailable() const { return true; } + + void startAdapter(); + void startInferior(); + void startInferiorPhase2(); + void interruptInferior(); + void shutdown(); + const char *inferiorShutdownCommand() const { return "kill"; } + +private: + void handleStubAttached(const GdbResponse &response); + + Q_SLOT void handleInferiorStarted(); + Q_SLOT void stubExited(); + Q_SLOT void stubError(const QString &msg); + + Utils::ConsoleProcess m_stubProc; +}; + +} // namespace Internal +} // namespace Debugger + +#endif // DEBUGGER_TERMGDBADAPTER_H