From 74f7cd1c26d9104b4cdf0e19413df507bda663c2 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Thu, 5 Mar 2015 18:17:00 +0100
Subject: [PATCH] Debugger: Simplify watcher handling in GdbEngine

There was only one user on GdbEngine::insertData left, and this
always took the !isSomethingNeeded branch.

Change-Id: Ibe51f7a7689be39ad3ffd60099a9cbe7b614648a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
 src/plugins/debugger/gdb/gdbengine.cpp | 40 ++++++--------------------
 src/plugins/debugger/gdb/gdbengine.h   |  6 ----
 src/plugins/debugger/watchhandler.h    |  2 +-
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 4b0e779dd24..fb369e4120b 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -903,7 +903,6 @@ void GdbEngine::postCommand(const QByteArray &command, int flags,
                       << "INCREMENTS PENDING TO" << m_pendingBreakpointRequests);
     } else {
         PENDING_DEBUG("   OTHER (IN):" << cmd.function
-                      << "LEAVES PENDING WATCH AT" << m_uncompleted.size()
                       << "LEAVES PENDING BREAKPOINT AT" << m_pendingBreakpointRequests);
     }
 
@@ -1189,15 +1188,13 @@ void GdbEngine::handleResultRecord(DebuggerResponse *response)
 
     if (cmd.flags & RebuildBreakpointModel) {
         --m_pendingBreakpointRequests;
-        PENDING_DEBUG("   BREAKPOINT" << cmd.function
-                      << "DECREMENTS PENDING TO" << m_uncompleted.size());
+        PENDING_DEBUG("   BREAKPOINT" << cmd.function);
         if (m_pendingBreakpointRequests <= 0) {
             PENDING_DEBUG("\n\n ... AND TRIGGERS BREAKPOINT MODEL UPDATE\n");
             attemptBreakpointSynchronization();
         }
     } else {
         PENDING_DEBUG("   OTHER (OUT):" << cmd.function
-                      << "LEAVES PENDING WATCH AT" << m_uncompleted.size()
                       << "LEAVES PENDING BREAKPOINT AT" << m_pendingBreakpointRequests);
     }
 
@@ -3740,13 +3737,13 @@ void GdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &f
     QByteArray processedName = "1-" + data.iname;
     //qDebug() << "PROCESSED NAMES: " << processedName << m_processedNames;
     if (m_processedNames.contains(processedName)) {
-        WatchData data1 = data;
-        showMessage(_("<Breaking endless loop for " + data.iname + '>'),
-            LogMiscInput);
-        data1.setAllUnneeded();
-        data1.setValue(_("<unavailable>"));
-        data1.setHasChildren(false);
-        insertData(data1);
+        showMessage(_("<Breaking endless loop for " + data.iname + '>'), LogMiscInput);
+        auto item = new WatchItem(data);
+        item->d.setAllUnneeded();
+        item->d.setValue(_("<unavailable>"));
+        item->d.setHasChildren(false);
+        watchHandler()->insertItem(item);
+        rebuildWatchModel();
         return;
     }
     m_processedNames.insert(processedName);
@@ -3765,8 +3762,6 @@ void GdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &f
 
 void GdbEngine::rebuildWatchModel()
 {
-    QTC_CHECK(m_completed.isEmpty());
-    QTC_CHECK(m_uncompleted.isEmpty());
     static int count = 0;
     ++count;
     PENDING_DEBUG("REBUILDING MODEL" << count);
@@ -3791,25 +3786,6 @@ void GdbEngine::updateLocals()
     updateLocalsPython(UpdateParameters());
 }
 
-void GdbEngine::insertData(const WatchData &data)
-{
-    PENDING_DEBUG("INSERT DATA" << data.toString());
-    if (data.isSomethingNeeded()) {
-        m_uncompleted.insert(data.iname);
-        WatchUpdateFlags flags;
-        flags.tryIncremental = true;
-        updateWatchData(data, flags);
-    } else {
-        m_completed.append(data);
-        m_uncompleted.remove(data.iname);
-        if (m_uncompleted.isEmpty()) {
-            watchHandler()->insertData(m_completed);
-            m_completed.clear();
-            rebuildWatchModel();
-        }
-    }
-}
-
 void GdbEngine::assignValueInDebugger(const WatchData *data,
     const QString &expression, const QVariant &value)
 {
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index a5bc93e88b3..3e3bca06fe0 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -403,8 +403,6 @@ protected:
     void rebuildWatchModel();
     void showToolTip();
 
-    void insertData(const WatchData &data);
-
     void handleVarAssign(const DebuggerResponse &response);
     void handleDetach(const DebuggerResponse &response);
     void handleThreadGroupCreated(const GdbMi &result);
@@ -474,10 +472,6 @@ protected:
     bool m_fullStartDone;
     bool m_systemDumpersLoaded;
 
-    // Test
-    QList<WatchData> m_completed;
-    QSet<QByteArray> m_uncompleted;
-
     static QString msgGdbStopFailed(const QString &why);
     static QString msgInferiorStopFailed(const QString &why);
     static QString msgAttachedToStoppedInferior();
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 444bef881ff..0687bce3a68 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -239,7 +239,7 @@ public:
     void insertData(const WatchData &data); // Convenience.
     void insertData(const QList<WatchData> &list);
     void insertIncompleteData(const WatchData &data);
-    void insertItem(WatchItem *item);
+    void insertItem(WatchItem *item); // Takes ownership.
     void removeData(const QByteArray &iname);
     void removeChildren(const QByteArray &iname);
     void removeAllData(bool includeInspectData = false);