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

Debugger: Prevent LLDB choking on extra dumper paths

Browse Source 
Change-Id: I230a05274e95430162c3f2d05de5d93bf4985b4e
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-01-28 17:17:31 +01:00
parent d7f364f915
commit ed2a84c822
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/debugger/lldbbridge.py
View File

@@ -1579,6 +1579,13 @@ class Dumper(DumperBase):
error = str(result.GetError()) error = str(result.GetError())
self.report('success="%d",output="%s",error="%s"' % (success, output, error)) self.report('success="%d",output="%s",error="%s"' % (success, output, error))
def addExtraDumper(self, args):
path = args['path']
(head, tail) = os.path.split(path)
sys.path.insert(1, head)
#dumpermodules.append(os.path.splitext(tail)[0])
self.report('ok')
def updateData(self, args): def updateData(self, args):
if 'expanded' in args: if 'expanded' in args:
self.expandedINames = set(args['expanded'].split(',')) self.expandedINames = set(args['expanded'].split(','))

12
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -273,15 +273,9 @@ void LldbEngine::setupInferior()
const QString path = stringSetting(ExtraDumperFile); const QString path = stringSetting(ExtraDumperFile);
if (!path.isEmpty()) { if (!path.isEmpty()) {
QFileInfo fi(path); Command cmd("addExtraDumper");
cmd.arg("path", path.toUtf8());
Command cmd1("executeDebuggerCommand"); runCommand(cmd);
cmd1.arg("command", "python sys.path.insert(1, '" + fi.absolutePath().toUtf8() + "')");
runCommand(cmd1);
Command cmd2("executeDebuggerCommand");
cmd2.arg("python from " + fi.baseName().toUtf8() + " import *");
runCommand(cmd2);
} }
const QString commands = stringSetting(ExtraDumperCommands); const QString commands = stringSetting(ExtraDumperCommands);