Debugger: Consolidate some GDB-through-Python interaction

Instead of calling a GDB extension command invoking a function
on the well-known Dumper instance, call the Dumper function
directly. This also makes the code more similar to the LLDB side.

Change-Id: I4b23177eb72a904721b63c578ce7fbfe204f02a2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

2 files changed, 13 insertions, 6 deletions

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 8fefd3d9c6..8a81b49c72 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1884,11 +1884,15 @@ void GdbEngine::notifyAdapterShutdownOk()
         .arg(lastGoodState()).arg(m_gdbProc->state()));
     m_commandsDoneCallback = 0;
     switch (m_gdbProc->state()) {
-    case QProcess::Running:
+    case QProcess::Running: {
         if (startParameters().closeMode == KillAndExitMonitorAtClose)
             postCommand("monitor exit");
-        postCommand("exitGdb", GdbEngine::ExitRequest, CB(handleGdbExit));
+        DebuggerCommand cmd("exitGdb");
+        cmd.flags = GdbEngine::ExitRequest;
+        cmd.callback = CB(handleGdbExit);
+        runCommand(cmd);
         break;
+    }
     case QProcess::NotRunning:
         // Cannot find executable.
         notifyEngineShutdownOk();
@@ -4287,8 +4291,11 @@ void GdbEngine::startGdb(const QStringList &args)
     postCommand("python from gdbbridge import *", flags);
 
     const QString path = stringSetting(ExtraDumperFile);
-    if (!path.isEmpty())
-        postCommand("python addExtraDumper('" + path.toUtf8() + "')", flags);
+    if (!path.isEmpty()) {
+        DebuggerCommand cmd("addDumperModule");
+        cmd.arg("path", path.toUtf8());
+        runCommand(cmd);
+    }
 
     const QString commands = stringSetting(ExtraDumperCommands);
     if (!commands.isEmpty())
@@ -4324,7 +4331,7 @@ void GdbEngine::loadInitScript()
 
 void GdbEngine::reloadDebuggingHelpers()
 {
-    postCommand("reload");
+    runCommand("reloadDumper");
     reloadLocals();
 }
 
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 545928b500..903b0bea20 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -285,7 +285,7 @@ void LldbEngine::setupInferior()
 
     const QString path = stringSetting(ExtraDumperFile);
     if (!path.isEmpty()) {
-        DebuggerCommand cmd("addExtraDumper");
+        DebuggerCommand cmd("addDumperModule");
         cmd.arg("path", path.toUtf8());
         runCommand(cmd);
     }