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

Debugger: Use Qt's JSON encoder for debugger protocol

Browse Source 
The V4 debug service expects correct JSON as input and gdb, lldb, and
pdb expect Python object literals. There is a subset of JSON that is
also valid as Python object literals and we use that for the protocol
spoken with gdb, lldb, and pdb. The strings passed to CDB are tunneled
through JSON strings and converted to byte arrays before sending them.

Change-Id: I87319b5450e5c3c3b29c565b75cddaa612767611
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-09-14 13:40:35 +02:00
parent 7d3bb6fdee
commit d5707e0e32
8 changed files with 99 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/debuggerprotocol.h
View File

@@ -34,6 +34,8 @@
#include <QByteArray>
#include <QList>
#include <QString>
#include <QJsonValue>
#include <QJsonObject>
#include <functional>
#include <vector>
@@ -53,7 +55,7 @@ public:
DebuggerCommand(const char *f, int flags = 0, Callback cb = Callback())
: function(f), callback(cb), flags(flags)
{}
DebuggerCommand(const char *f, const char *a, int flags = 0, Callback cb = Callback())
DebuggerCommand(const char *f, const QJsonValue &a, int flags = 0, Callback cb = Callback())
: function(f), args(a), callback(cb), flags(flags)
{}
DebuggerCommand(const char *f, Callback cb)
@@ -61,7 +63,7 @@ public:
{}
DebuggerCommand(const QByteArray &f) : function(f), flags(0) {}
void arg(const char *name);
void arg(const char *value);
void arg(const char *name, int value);
void arg(const char *name, qlonglong value);
void arg(const char *name, qulonglong value);
@@ -69,21 +71,16 @@ public:
void arg(const char *name, const QByteArray &value);
void arg(const char *name, const char *value);
void arg(const char *name, const QList<int> &list);
void arg(const char *name, const QJsonValue &value);
void beginList(const char *name = 0);
void endList();
void beginGroup(const char *name = 0);
void endGroup();
QByteArray arguments() const;
QByteArray argsToPython() const;
QByteArray argsToString() const;
QByteArray function;
QByteArray args;
QJsonValue args;
Callback callback;
uint postTime; // msecsSinceStartOfDay
int flags;
private:
void argHelper(const char *name, const QByteArray &value);
};
/*