diff options
author | emaste <emaste@FreeBSD.org> | 2014-02-25 22:13:51 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-02-25 22:13:51 +0000 |
commit | 6c70565c062addb40f7377f4097af94a515fc49d (patch) | |
tree | a6ea5728c855ec09e8a9b53d967c87f620cb160c /contrib/llvm/tools/lldb/source/Target/Process.cpp | |
parent | 6c344e019fa72f3c5234bcdbd443a512c951ee02 (diff) | |
download | FreeBSD-src-6c70565c062addb40f7377f4097af94a515fc49d.zip FreeBSD-src-6c70565c062addb40f7377f4097af94a515fc49d.tar.gz |
Update LLDB snapshot to upstream r202189
Highlights include:
- Support hardware watchpoints on FreeBSD
(r201706)
- Improved unwinding through hand-written assembly functions
(r201839)
- Handle DW_TAG_unspecified_parameters for variadic functions
(r202061)
- Fix Ctrl+C interrupting a running inferior process
(r202086, r202154)
- Various bug fixes, including to the remote GDB protocol client
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Target/Process.cpp')
-rw-r--r-- | contrib/llvm/tools/lldb/source/Target/Process.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/contrib/llvm/tools/lldb/source/Target/Process.cpp b/contrib/llvm/tools/lldb/source/Target/Process.cpp index 40d3e49..1256ad3 100644 --- a/contrib/llvm/tools/lldb/source/Target/Process.cpp +++ b/contrib/llvm/tools/lldb/source/Target/Process.cpp @@ -4824,13 +4824,21 @@ public: { } + virtual void - Interrupt () + Cancel () { size_t n = 1; char ch = 'q'; m_pipe_write.Write (&ch, n); } + + virtual void + Interrupt () + { + if (StateIsRunningState(m_process->GetState())) + m_process->SendAsyncInterrupt(); + } virtual void GotEOF() @@ -4859,7 +4867,7 @@ Process::CancelWatchForSTDIN (bool exited) { if (exited) m_process_input_reader->SetIsDone(true); - m_process_input_reader->Interrupt(); + m_process_input_reader->Cancel(); } } @@ -4903,7 +4911,7 @@ Process::PopProcessIOHandler () IOHandlerSP io_handler_sp (m_process_input_reader); if (io_handler_sp) { - io_handler_sp->Interrupt(); + io_handler_sp->Cancel(); m_target.GetDebugger().PopIOHandler (io_handler_sp); } } |