Fixed the command line LLDB so that "CTRL+C" will interrupt a running process again.

llvm-svn: 202086

1 files changed, 11 insertions, 3 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 40d3e4950c6..931a068243c 100644
--- a/lldb/source/Target/Process.cpp
+++ b/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->Halt();
+    }
     
     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);
     }
 }