feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use base DebuggerResponse also in PdbEngine

Browse Source 
Change-Id: I1bcc62f191dfc7a201da7b5723c15587c7ba4e7f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-02-13 11:53:37 +01:00
parent ed7c287f50
commit fae20871fa
2 changed files with 41 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/plugins/debugger/pdb/pdbengine.cpp
View File

@@ -74,7 +74,7 @@
# define XSDEBUG(s) qDebug() << s # define XSDEBUG(s) qDebug() << s
#define CB(callback) &PdbEngine::callback, STRINGIFY(callback) #define CB(callback) [this](const DebuggerResponse &r) { callback(r); }
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
@@ -108,7 +108,7 @@ void PdbEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages
postCommand(command.toLatin1(), CB(handleExecuteDebuggerCommand)); postCommand(command.toLatin1(), CB(handleExecuteDebuggerCommand));
} }
void PdbEngine::handleExecuteDebuggerCommand(const PdbResponse &response) void PdbEngine::handleExecuteDebuggerCommand(const DebuggerResponse &response)
{ {
Q_UNUSED(response); Q_UNUSED(response);
} }
@@ -120,20 +120,14 @@ void PdbEngine::postDirectCommand(const QByteArray &command)
m_pdbProc.write(command + '\n'); m_pdbProc.write(command + '\n');
} }
void PdbEngine::postCommand(const QByteArray &command, void PdbEngine::postCommand(const QByteArray &command, DebuggerCommand::Callback callback)
// PdbCommandFlags flags,
PdbCommandCallback callback,
const char *callbackName,
const QVariant &cookie)
{ {
QTC_ASSERT(m_pdbProc.state() == QProcess::Running, notifyEngineIll()); QTC_ASSERT(m_pdbProc.state() == QProcess::Running, notifyEngineIll());
PdbCommand cmd; PdbCommand cmd;
cmd.command = command; cmd.command = command;
cmd.callback = callback; cmd.callback = callback;
cmd.callbackName = callbackName;
cmd.cookie = cookie;
m_commands.enqueue(cmd); m_commands.enqueue(cmd);
qDebug() << "ENQUEUE: " << command << cmd.callbackName; qDebug() << "ENQUEUE: " << command;
showMessage(_(cmd.command), LogInput); showMessage(_(cmd.command), LogInput);
m_pdbProc.write(cmd.command + '\n'); m_pdbProc.write(cmd.command + '\n');
} }
@@ -171,7 +165,7 @@ void PdbEngine::setupEngine()
// We will stop immediately, so setup a proper callback. // We will stop immediately, so setup a proper callback.
PdbCommand cmd; PdbCommand cmd;
cmd.callback = &PdbEngine::handleFirstCommand; cmd.callback = CB(handleFirstCommand);
m_commands.enqueue(cmd); m_commands.enqueue(cmd);
m_pdbProc.start(m_pdb, QStringList() << _("-i")); m_pdbProc.start(m_pdb, QStringList() << _("-i"));
@@ -349,25 +343,24 @@ void PdbEngine::insertBreakpoint(Breakpoint bp)
loc = bp.fileName().toLocal8Bit() + ':' loc = bp.fileName().toLocal8Bit() + ':'
+ QByteArray::number(bp.lineNumber()); + QByteArray::number(bp.lineNumber());
postCommand("break " + loc, CB(handleBreakInsert), QVariant::fromValue(bp)); postCommand("break " + loc, [this, bp](const DebuggerResponse &r) { handleBreakInsert(r, bp); });
} }
void PdbEngine::handleBreakInsert(const PdbResponse &response) void PdbEngine::handleBreakInsert(const DebuggerResponse &response, Breakpoint bp)
{ {
//qDebug() << "BP RESPONSE: " << response.data; //qDebug() << "BP RESPONSE: " << response.data;
// "Breakpoint 1 at /pdb/math.py:10" // "Breakpoint 1 at /pdb/math.py:10"
QTC_ASSERT(response.data.startsWith("Breakpoint "), return); QTC_ASSERT(response.logStreamOutput.startsWith("Breakpoint "), return);
int pos1 = response.data.indexOf(" at "); int pos1 = response.logStreamOutput.indexOf(" at ");
QTC_ASSERT(pos1 != -1, return); QTC_ASSERT(pos1 != -1, return);
QByteArray bpnr = response.data.mid(11, pos1 - 11); QByteArray bpnr = response.logStreamOutput.mid(11, pos1 - 11);
int pos2 = response.data.lastIndexOf(':'); int pos2 = response.logStreamOutput.lastIndexOf(':');
QByteArray file = response.data.mid(pos1 + 4, pos2 - pos1 - 4); QByteArray file = response.logStreamOutput.mid(pos1 + 4, pos2 - pos1 - 4);
QByteArray line = response.data.mid(pos2 + 1); QByteArray line = response.logStreamOutput.mid(pos2 + 1);
BreakpointResponse br; BreakpointResponse br;
br.id = BreakpointResponseId(bpnr); br.id = BreakpointResponseId(bpnr);
br.fileName = _(file); br.fileName = _(file);
br.lineNumber = line.toInt(); br.lineNumber = line.toInt();
Breakpoint bp = response.cookie.value<Breakpoint>();
bp.setResponse(br); bp.setResponse(br);
QTC_CHECK(!bp.needsChange()); QTC_CHECK(!bp.needsChange());
bp.notifyBreakpointInsertOk(); bp.notifyBreakpointInsertOk();
@@ -398,10 +391,10 @@ void PdbEngine::reloadModules()
//postCommand("qdebug('listmodules')", CB(handleListModules)); //postCommand("qdebug('listmodules')", CB(handleListModules));
} }
void PdbEngine::handleListModules(const PdbResponse &response) void PdbEngine::handleListModules(const DebuggerResponse &response)
{ {
GdbMi out; GdbMi out;
out.fromString(response.data.trimmed()); out.fromString(response.logStreamOutput.trimmed());
ModulesHandler *handler = modulesHandler(); ModulesHandler *handler = modulesHandler();
handler->beginUpdateAll(); handler->beginUpdateAll();
foreach (const GdbMi &item, out.children()) { foreach (const GdbMi &item, out.children()) {
@@ -426,15 +419,14 @@ void PdbEngine::handleListModules(const PdbResponse &response)
void PdbEngine::requestModuleSymbols(const QString &moduleName) void PdbEngine::requestModuleSymbols(const QString &moduleName)
{ {
postCommand("qdebug('listsymbols','" + moduleName.toLatin1() + "')", postCommand("qdebug('listsymbols','" + moduleName.toLatin1() + "')",
CB(handleListSymbols), moduleName); [this, moduleName](const DebuggerResponse &r) { handleListSymbols(r, moduleName); });
} }
void PdbEngine::handleListSymbols(const PdbResponse &response) void PdbEngine::handleListSymbols(const DebuggerResponse &response, const QString &moduleName)
{ {
GdbMi out; GdbMi out;
out.fromString(response.data.trimmed()); out.fromString(response.logStreamOutput.trimmed());
Symbols symbols; Symbols symbols;
QString moduleName = response.cookie.toString();
foreach (const GdbMi &item, out.children()) { foreach (const GdbMi &item, out.children()) {
Symbol symbol; Symbol symbol;
symbol.name = _(item["name"].data()); symbol.name = _(item["name"].data());
@@ -634,19 +626,18 @@ void PdbEngine::handleOutput(const QByteArray &data)
void PdbEngine::handleOutput2(const QByteArray &data) void PdbEngine::handleOutput2(const QByteArray &data)
{ {
PdbResponse response; DebuggerResponse response;
response.data = data; response.logStreamOutput = data;
showMessage(_(data)); showMessage(_(data));
QTC_ASSERT(!m_commands.isEmpty(), qDebug() << "RESPONSE: " << data; return); QTC_ASSERT(!m_commands.isEmpty(), qDebug() << "RESPONSE: " << data; return);
PdbCommand cmd = m_commands.dequeue(); PdbCommand cmd = m_commands.dequeue();
response.cookie = cmd.cookie; qDebug() << "DEQUE: " << cmd.command;
qDebug() << "DEQUE: " << cmd.command << cmd.callbackName;
if (cmd.callback) { if (cmd.callback) {
//qDebug() << "EXECUTING CALLBACK " << cmd.callbackName //qDebug() << "EXECUTING CALLBACK " << cmd.callbackName
// << " RESPONSE: " << response.data; // << " RESPONSE: " << response.data;
(this->*cmd.callback)(response); cmd.callback(response);
} else { } else {
qDebug() << "NO CALLBACK FOR RESPONSE: " << response.data; qDebug() << "NO CALLBACK FOR RESPONSE: " << response.logStreamOutput;
} }
} }
/* /*
@@ -684,12 +675,12 @@ void PdbEngine::handleResponse(const QByteArray &response0)
} }
*/ */
void PdbEngine::handleFirstCommand(const PdbResponse &response) void PdbEngine::handleFirstCommand(const DebuggerResponse &response)
{ {
Q_UNUSED(response); Q_UNUSED(response);
} }
void PdbEngine::handleUpdateAll(const PdbResponse &response) void PdbEngine::handleUpdateAll(const DebuggerResponse &response)
{ {
Q_UNUSED(response); Q_UNUSED(response);
notifyInferiorSpontaneousStop(); notifyInferiorSpontaneousStop();
@@ -735,7 +726,7 @@ void PdbEngine::updateLocals()
+ watchers.toHex() + "')", CB(handleListLocals)); + watchers.toHex() + "')", CB(handleListLocals));
} }
void PdbEngine::handleBacktrace(const PdbResponse &response) void PdbEngine::handleBacktrace(const DebuggerResponse &response)
{ {
//qDebug() << " BACKTRACE: '" << response.data << "'"; //qDebug() << " BACKTRACE: '" << response.data << "'";
// " /usr/lib/python2.6/bdb.py(368)run()" // " /usr/lib/python2.6/bdb.py(368)run()"
@@ -754,7 +745,7 @@ void PdbEngine::handleBacktrace(const PdbResponse &response)
StackFrames stackFrames; StackFrames stackFrames;
int level = 0; int level = 0;
int currentIndex = -1; int currentIndex = -1;
foreach (const QByteArray &line, response.data.split('\n')) { foreach (const QByteArray &line, response.logStreamOutput.split('\n')) {
//qDebug() << " LINE: '" << line << "'"; //qDebug() << " LINE: '" << line << "'";
if (line.startsWith("> ") || line.startsWith(" ")) { if (line.startsWith("> ") || line.startsWith(" ")) {
int pos1 = line.indexOf('('); int pos1 = line.indexOf('(');
@@ -794,10 +785,10 @@ void PdbEngine::handleBacktrace(const PdbResponse &response)
updateLocals(); updateLocals();
} }
void PdbEngine::handleListLocals(const PdbResponse &response) void PdbEngine::handleListLocals(const DebuggerResponse &response)
{ {
//qDebug() << " LOCALS: '" << response.data << "'"; //qDebug() << " LOCALS: '" << response.data << "'";
QByteArray out = response.data.trimmed(); QByteArray out = response.logStreamOutput.trimmed();
GdbMi all; GdbMi all;
all.fromStringMultiple(out); all.fromStringMultiple(out);

43
src/plugins/debugger/pdb/pdbengine.h
View File

@@ -37,7 +37,6 @@
#include <QQueue> #include <QQueue>
#include <QVariant> #include <QVariant>
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
@@ -47,13 +46,6 @@ class GdbMi;
/* A debugger engine for Python using the pdb command line debugger. /* A debugger engine for Python using the pdb command line debugger.
*/ */
class PdbResponse
{
public:
QByteArray data;
QVariant cookie;
};
class PdbEngine : public DebuggerEngine class PdbEngine : public DebuggerEngine
{ {
Q_OBJECT Q_OBJECT
@@ -126,40 +118,29 @@ private:
void handleOutput(const QByteArray &data); void handleOutput(const QByteArray &data);
void updateAll(); void updateAll();
void updateLocals(); void updateLocals();
void handleUpdateAll(const PdbResponse &response); void handleUpdateAll(const DebuggerResponse &response);
void handleFirstCommand(const PdbResponse &response); void handleFirstCommand(const DebuggerResponse &response);
void handleExecuteDebuggerCommand(const PdbResponse &response); void handleExecuteDebuggerCommand(const DebuggerResponse &response);
typedef void (PdbEngine::*PdbCommandCallback)
(const PdbResponse &response);
struct PdbCommand struct PdbCommand
{ {
PdbCommand() PdbCommand() : callback(0) {}
: callback(0), callbackName(0)
{}
PdbCommandCallback callback; DebuggerCommand::Callback callback;
const char *callbackName;
QByteArray command; QByteArray command;
QVariant cookie;
//QTime postTime;
}; };
void handleStop(const PdbResponse &response); void handleStop(const DebuggerResponse &response);
void handleBacktrace(const PdbResponse &response); void handleBacktrace(const DebuggerResponse &response);
void handleListLocals(const PdbResponse &response); void handleListLocals(const DebuggerResponse &response);
void handleListModules(const PdbResponse &response); void handleListModules(const DebuggerResponse &response);
void handleListSymbols(const PdbResponse &response); void handleListSymbols(const DebuggerResponse &response, const QString &moduleName);
void handleBreakInsert(const PdbResponse &response); void handleBreakInsert(const DebuggerResponse &response, Breakpoint bp);
void handleChildren(const WatchData &data0, const GdbMi &item, void handleChildren(const WatchData &data0, const GdbMi &item,
QList<WatchData> *list); QList<WatchData> *list);
void postCommand(const QByteArray &command, void postCommand(const QByteArray &command,
//GdbCommandFlags flags = 0, DebuggerCommand::Callback callback = 0);
PdbCommandCallback callback = 0,
const char *callbackName = 0,
const QVariant &cookie = QVariant());
void postDirectCommand(const QByteArray &command); void postDirectCommand(const QByteArray &command);
QQueue<PdbCommand> m_commands; QQueue<PdbCommand> m_commands;