maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Command files that switch input handlers didn't work, now they do. 

The issue was when we called Debugger::RunIOHandler(), it would run the current IOHandler by activating it, and running it and then try to pop it and exit regardless of wether it was on top or not.

The new code will push the IOHandler that was passed in, and run the IOHandlers until the one passed in is successfully popped. This allows files for the "command source" to switch input handlers:

% cat /tmp/commands
br s -S alignLeftEdges:
br command add
bt
frame var
po self
DONE
b s -n main
br command add
bt
frame var
DONE

Note above we set a breakpoint, then add commands do it. The "br command add" will push the breakpoint comment gatherer until it sees "DONE" and then pop itself off the stack. The a new breakpoint will be set and it does the same thing again.

Now this file can be sourced from the command line:

% lldb -s /tmp/commands /path/to/a.out

And your breakpoints will be correctly setup!

<rdar://problem/17081650>

llvm-svn: 211329
This commit is contained in:
Greg Clayton 2014-06-20 00:23:57 +00:00
parent 393b2b594f
commit 577508df83
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lldb/source/Core/Debugger.cpp
View File

@ -902,9 +902,29 @@ Debugger::RunIOHandler (const IOHandlerSP& reader_sp)
{ {
Mutex::Locker locker (m_input_reader_stack.GetMutex()); Mutex::Locker locker (m_input_reader_stack.GetMutex());
PushIOHandler (reader_sp); PushIOHandler (reader_sp);
reader_sp->Activate();
reader_sp->Run(); IOHandlerSP top_reader_sp = reader_sp;
PopIOHandler (reader_sp); while (top_reader_sp)
{
top_reader_sp->Activate();
top_reader_sp->Run();
top_reader_sp->Deactivate();
if (top_reader_sp.get() == reader_sp.get())
{
if (PopIOHandler (reader_sp))
break;
}
while (1)
{
top_reader_sp = m_input_reader_stack.Top();
if (top_reader_sp && top_reader_sp->GetIsDone())
m_input_reader_stack.Pop();
else
break;
}
}
} }
void void