From b75209d653ffc9906b2e2b90e0ca63a809755b3a Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 29 May 2013 15:38:49 +0200
Subject: [PATCH] Debugger: Cleaner shutdown of LLDB/python machinery

Change-Id: I482e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 share/qtcreator/dumper/lbridge.py        | 23 ++++++++++++++---------
 src/plugins/debugger/lldb/lldbengine.cpp | 10 +++++++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/share/qtcreator/dumper/lbridge.py b/share/qtcreator/dumper/lbridge.py
index 452d9d44161..bb2f8bb84b1 100644
--- a/share/qtcreator/dumper/lbridge.py
+++ b/share/qtcreator/dumper/lbridge.py
@@ -525,6 +525,7 @@ class Dumper:
         self.sizetType_ = None
         self.charPtrType_ = None
         self.voidType_ = None
+        self.isShuttingDown_ = False
 
     def extractTemplateArgument(self, typename, index):
         level = 0
@@ -1020,9 +1021,12 @@ class Dumper:
             self.report('state="%s"' % stateNames[state])
             self.eventState = state
             if state == lldb.eStateExited:
-                warn("PROCESS EXITED. %d: %s"
+                if self.isShuttingDown_:
+                    self.report('state="inferiorshutdownok"')
+                else:
+                    self.report('state="inferiorexited"')
+                self.report('exited={status="%s",desc="%s"}'
                     % (self.process.GetExitStatus(), self.process.GetExitDescription()))
-                self.report('state="inferiorexited"')
         if type == lldb.SBProcess.eBroadcastBitStateChanged:
             self.reportData()
         elif type == lldb.SBProcess.eBroadcastBitInterrupt:
@@ -1190,8 +1194,13 @@ class Dumper:
     def executeStep(self, _ = None):
         self.currentThread().StepInto()
 
+    def shutdownInferior(self, _ = None):
+        self.isShuttingDown_ = True
+        self.process.Kill()
+
     def quit(self, _ = None):
-        self.debugger.Terminate()
+        self.report('state="engineshutdownok"')
+        self.process.Kill()
 
     def executeStepI(self, _ = None):
         self.currentThread().StepInstruction(lldb.eOnlyThisThread)
@@ -1229,12 +1238,8 @@ class Dumper:
         command = args['command']
         self.debugger.GetCommandInterpreter().HandleCommand(command, result)
         success = result.Succeeded()
-        if success:
-            output = result.GetOutput()
-            error = ''
-        else:
-            output = ''
-            error = str(result.GetError())
+        output = result.GetOutput()
+        error = str(result.GetError())
         self.report('success="%d",output="%s",error="%s"' % (success, output, error))
 
     def setOptions(self, args):
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 1680a182962..5f0397b80a1 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -119,7 +119,7 @@ void LldbEngine::runCommand(const Command &command)
 void LldbEngine::shutdownInferior()
 {
     QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
-    notifyInferiorShutdownOk();
+    runCommand(Command("shutdownInferior"));
 }
 
 void LldbEngine::shutdownEngine()
@@ -1018,6 +1018,14 @@ void LldbEngine::refreshState(const GdbMi &reportedState)
         notifyEngineRunAndInferiorRunOk();
     else if (newState == "enginerunandinferiorstopok")
         notifyEngineRunAndInferiorStopOk();
+    else if (newState == "inferiorshutdownok")
+        notifyInferiorShutdownOk();
+    else if (newState == "inferiorshutdownfailed")
+        notifyInferiorShutdownFailed();
+    else if (newState == "engineshutdownok")
+        notifyEngineShutdownOk();
+    else if (newState == "engineshutdownfailed")
+        notifyEngineShutdownFailed();
     else if (newState == "inferiorexited")
         notifyInferiorExited();
 }