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

Debugger: Simplify LLDB test loop handling

Browse Source 
We know that we expect a frame with valid debug info.

Change-Id: I51079ca4db87df05c93464fd46e5add1f756cba7
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-04-14 09:06:28 +02:00
parent 952af535d2
commit c9cce0b541
2 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1748,6 +1748,9 @@ class Tester(Dumper):
s.start()
s.join(30)
def reportDumpers(self, msg):
pass
def testLoop(self):
# Disable intermediate reporting.
savedReport = self.report
@@ -1769,53 +1772,37 @@ class Tester(Dumper):
state = self.process.GetState()
if listener.WaitForEvent(100, event):
#warn("EVENT: %s" % event)
out = lldb.SBStream()
event.GetDescription(out)
msg = lldb.SBEvent.GetCStringFromEvent(event)
flavor = event.GetDataFlavor()
state = lldb.SBProcess.GetStateFromEvent(event)
#warn('event={type="%s",data="%s",msg="%s",flavor="%s",state="%s"}'
# % (event.GetType(), out.GetData(), msg, flavor, state))
state = lldb.SBProcess.GetStateFromEvent(event)
if state == lldb.eStateExited: # 10
break
if state == lldb.eStateStopped: # 5
stoppedThread = self.firstStoppedThread()
if stoppedThread is None:
warn("NO STOPPED THREAD FOUND")
continue
stoppedThread = None
for i in xrange(0, self.process.GetNumThreads()):
thread = self.process.GetThreadAtIndex(i)
reason = thread.GetStopReason()
#warn("THREAD: %s REASON: %s" % (thread, reason))
if (reason == lldb.eStopReasonBreakpoint or
reason == lldb.eStopReasonException or
reason == lldb.eStopReasonSignal):
stoppedThread = thread
#for i in xrange(0, self.process.GetNumThreads()):
# thread = self.process.GetThreadAtIndex(i)
# reason = thread.GetStopReason()
# warn("THREAD: %s REASON: %s" % (thread, reason))
try:
if stoppedThread:
# This seems highly fragile and depending on the "No-ops" in the
# event handling above.
frame = stoppedThread.GetFrameAtIndex(0)
break
except:
warn("NO FRAME FOUND FOR THREAD %s" % stoppedThread)
line = frame.line_entry.line
if line != 0:
self.report = savedReport
self.process.SetSelectedThread(stoppedThread)
self.reportVariables()
#self.reportLocation(frame)
self.report("@NS@%s@" % self.qtNamespace())
#self.report("ENV=%s" % os.environ.items())
#self.report("DUMPER=%s" % self.qqDumpers)
break
else:
warn('TIMEOUT')
warn("Cannot determined stopped thread")
stoppedThread = self.firstStoppedThread()
if not stoppedThread:
warn("Cannot determined stopped thread")
return
# This seems highly fragile and depending on the "No-ops" in the
# event handling above.
self.process.SetSelectedThread(stoppedThread)
frame = stoppedThread.GetFrameAtIndex(0)
#file = fileName(frame.line_entry.file)
#line = frame.line_entry.line
#warn('LOCATION={file="%s",line="%s",addr="%s"}'
# % (file, line, frame.pc))
self.report = savedReport
self.reportVariables()
self.report("@NS@%s@" % self.qtNamespace())
#self.report("ENV=%s" % os.environ.items())
#self.report("DUMPER=%s" % self.qqDumpers)
lldb.SBDebugger.Destroy(self.debugger)

2
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -1273,7 +1273,7 @@ void tst_Dumpers::dumper()
cmds = "sc import sys\n"
"sc sys.path.insert(1, '" + dumperDir + "')\n"
"sc from lldbbridge import *\n"
"sc print(dir())\n"
// "sc print(dir())\n"
"sc Tester('" + t->buildPath.toLatin1() + "/doit', [" + expandedq + "])\n"
"quit\n";