Debugger: add some food for the threads view in the LLDB backend

Change-Id: I6d8ea11d6c6e1206e5d1c3f13a51ae0521f25a85
Reviewed-by: hjk <hjk121@nokiamail.com>

share/qtcreator/dumper/bridge.py

@@ -559,6 +559,53 @@ try:
     def fieldCount(type):
         return type.fieldCount();
 
+    def threadsData(threadsOptions):
+        result = "threads={threads=["
+        for i in range(lldb.process.num_threads):
+            thread = lldb.process.GetThreadAtIndex(i)
+            result += "{id=\"%d\"" % thread.id
+            result += ",target-id=\"%s\"" % thread.id
+            result += ",stop-reason=\"%s\"" % thread.stop_reason
+
+            if thread.IsSuspended():
+                result += ",state=\"stopped\""
+            else:
+                result += ",state=\"running\""
+
+            if not thread.name is None:
+                result += ",name=\"%s\"" % thread.name
+
+            result += ",frame={"
+            frame = thread.GetFrameAtIndex(0)
+            result += "pc=\"%s\"" % frame.pc
+            result += ",level=\"%d\"" % i
+            result += ",addr=\"%s\"" % frame.pc
+            result += ",fp=\"%s\"" % frame.fp
+            result += ",func=\"%s\"" % frame.function.name
+            result += ",line=\"%s\"" % frame.line_entry.line
+            result += ",fullname=\"%s\"" % frame.line_entry.file
+            result += ",file=\"%s\"" % frame.line_entry.file
+            result += "}},"
+
+        result += "],current-thread-id=\"%s\"}" % lldb.process.GetSelectedThread().id
+        return result
+
+    def stackData(stackOptions):
+        result = "stack=["
+        result += "],"
+        return result
+
+    def updateData(parts, localsOptions, stackOptions, threadsOptions):
+        result = "";
+        if parts & 1:
+            result += bb(localsOptions) + ','
+        if parts & 2:
+            result += stackData(stackOptions)
+        if parts & 4:
+            result += threadsData(threadsOptions)
+        return result
+
+
 except:
     #warn("LOADING LLDB FAILED")
     pass

src/plugins/debugger/lldb/lldbengine.cpp

@@ -43,6 +43,7 @@
 #include "registerhandler.h"
 #include "stackhandler.h"
 #include "sourceutils.h"
+#include "threadshandler.h"
 #include "watchhandler.h"
 #include "watchutils.h"
 
@@ -360,13 +361,13 @@ void LldbEngine::activateFrame(int frameIndex)
         return;
 
     postCommand("frame select " + QByteArray::number(frameIndex),
-        CB(handleUpdateAll));
+        CB(triggerUpdateAll));
 }
 
 void LldbEngine::selectThread(ThreadId threadId)
 {
     postCommand("thread select " + QByteArray::number(threadId.raw()),
-        CB(handleUpdateAll));
+        CB(triggerUpdateAll));
 }
 
 bool LldbEngine::acceptsBreakpoint(BreakpointModelId id) const
@@ -757,7 +758,7 @@ void LldbEngine::handleFirstCommand(const LldbResponse &response)
     Q_UNUSED(response);
 }
 
-void LldbEngine::handleUpdateAll(const LldbResponse &response)
+void LldbEngine::triggerUpdateAll(const LldbResponse &response)
 {
     Q_UNUSED(response);
     updateAll();
@@ -765,12 +766,16 @@ void LldbEngine::handleUpdateAll(const LldbResponse &response)
 
 void LldbEngine::updateAll()
 {
-    //postCommand("bt", CB(handleBacktrace));
-    updateLocals();
+    updateData(DataKind(LocalsData | StackData | ThreadData));
 }
 
-void LldbEngine::updateLocals()
+void LldbEngine::updateData(DataKind kind)
 {
+    QByteArray localsOptions;
+    QByteArray stackOptions;
+    QByteArray threadsOptions;
+
+    if (kind & LocalsData) {
         QByteArray watchers;
         //if (!m_toolTipExpression.isEmpty())
         //    watchers += m_toolTipExpression.toLatin1()
@@ -795,13 +800,19 @@ void LldbEngine::updateLocals()
             options += "defaults,";
         options.chop(1);
 
-    postCommand("script bb('options:" + options + " "
+        localsOptions = "options:" + options + " "
             + "vars: "
             + "expanded:" + handler->expansionRequests() + " "
             + "typeformats:" + handler->typeFormatRequests() + " "
             + "formats:" + handler->individualFormatRequests() + " "
-        + "watcher:" + watchers.toHex() + "')",
-                CB(handleListLocals));
+            + "watcher:" + watchers.toHex();
+    }
+
+    postCommand("script updateData(" + QByteArray::number(kind) + ','
+            + '\'' + localsOptions + "',"
+            + '\'' + stackOptions + "',"
+            + '\'' + threadsOptions + "')",
+                CB(handleUpdateData));
 }
 
 void LldbEngine::handleBacktrace(const LldbResponse &response)
@@ -847,19 +858,17 @@ void LldbEngine::handleBacktrace(const LldbResponse &response)
         gotoLocation(stackFrames.at(currentIndex));
     }
 
-    updateLocals();
+    updateData(LocalsData);
 }
 
-void LldbEngine::handleListLocals(const LldbResponse &response)
+GdbMi LldbEngine::parseFromString(QByteArray out)
 {
-    //qDebug() << " LOCALS: '" << response.data << "'";
-    QByteArray out = response.data;
+    GdbMi all;
 
-    {
     int pos = out.indexOf("data=");
     if (pos == -1) {
         showMessage(_("UNEXPECTED LOCALS OUTPUT:" + out));
-            return;
+        return all;
     }
 
     // The value in 'out' should be single-quoted as this is
@@ -873,12 +882,18 @@ void LldbEngine::handleListLocals(const LldbResponse &response)
         out.chop(1);
     else
         showMessage(_("JUNK AT END OF RESPONSE: " + out));
-    }
 
-    GdbMi all;
     all.fromStringMultiple(out);
-    GdbMi data = all.findChild("data");
+    return all;
+}
 
+void LldbEngine::handleUpdateData(const LldbResponse &response)
+{
+    //qDebug() << " LOCALS: '" << response.data << "'";
+    GdbMi all = parseFromString(response.data);
+
+    GdbMi vars = all.findChild("data");
+    if (vars.isValid()) {
         const bool partial = response.cookie.toBool();
         WatchHandler *handler = watchHandler();
         QList<WatchData> list;
@@ -889,7 +904,7 @@ void LldbEngine::handleListLocals(const LldbResponse &response)
             list.append(*handler->findData("return"));
         }
 
-    foreach (const GdbMi &child, data.children()) {
+        foreach (const GdbMi &child, vars.children()) {
             WatchData dummy;
             dummy.iname = child.findChild("iname").data();
             GdbMi wname = child.findChild("wname");
@@ -903,6 +918,9 @@ void LldbEngine::handleListLocals(const LldbResponse &response)
             }
             parseWatchData(handler->expandedINames(), dummy, child, &list);
         }
+        handler->insertData(list);
+    }
+
 //    const GdbMi typeInfo = all.findChild("typeinfo");
 //    if (typeInfo.type() == GdbMi::List) {
 //        foreach (const GdbMi &s, typeInfo.children()) {
@@ -919,11 +937,23 @@ void LldbEngine::handleListLocals(const LldbResponse &response)
 //            list[i].size = ti.size;
 //    }
 
-    handler->insertData(list);
+    GdbMi stack = all.findChild("stack");
+    if (stack.isValid()) {
+        //if (!partial)
+        //    emit stackFrameCompleted();
+    }
 
-    //rebuildWatchModel();
-    if (!partial)
-        emit stackFrameCompleted();
+    GdbMi threads = all.findChild("threads");
+    if (threads.isValid()) {
+        ThreadsHandler *handler = threadsHandler();
+        handler->updateThreads(threads);
+        if (!handler->currentThread().isValid()) {
+            ThreadId other = handler->threadAt(0);
+            if (other.isValid())
+                selectThread(other);
+        }
+        updateViews(); // Adjust Threads combobox.
+    }
 }
 
 void LldbEngine::loadPythonDumpers()

src/plugins/debugger/lldb/lldbengine.h

@@ -121,10 +121,13 @@ private:
     Q_SLOT void handleOutput2(const QByteArray &data);
     void handleResponse(const QByteArray &ba);
 
+    enum DataKind { LocalsData = 1, StackData = 2, ThreadData = 4 };
+
     void loadPythonDumpers();
     void updateAll();
-    void updateLocals();
-    void handleUpdateAll(const LldbResponse &response);
+    void updateData(DataKind kind);
+    void triggerUpdateAll(const LldbResponse &response);
+    void handleUpdateData(const LldbResponse &response);
     void handleFirstCommand(const LldbResponse &response);
     void handleExecuteDebuggerCommand(const LldbResponse &response);
     void handleInferiorSetup(const LldbResponse &response);
@@ -152,6 +155,8 @@ private:
     void handleListModules(const LldbResponse &response);
     void handleListSymbols(const LldbResponse &response);
     void handleBreakInsert(const LldbResponse &response);
+    void handleUpdateStack(const LldbResponse &response);
+    void handleUpdateThreads(const LldbResponse &response);
 
     void handleChildren(const WatchData &data0, const GdbMi &item,
         QList<WatchData> *list);
@@ -160,6 +165,7 @@ private:
                      const char *callbackName = 0,
                      const QVariant &cookie = QVariant());
     void postDirectCommand(const QByteArray &command);
+    GdbMi parseFromString(QByteArray out);
 
     QQueue<LldbCommand> m_commands;