feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Avoid looking up references too often

Browse Source 
Multiple copies of lookup requests may accumulate when stepping
too quickly, outsmarting the 'all updates done' logic, keeping
Locals&Expressions in the grey 'update ongoing' state.

Change-Id: Icec24ce1af8d273c3439ee91800ed1f4381ee19a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
(cherry picked from commit c1de315d6c)
This commit is contained in:
hjk
2016-04-13 15:13:54 +02:00
parent 25603f9dc8
commit 12788ffb2d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -125,7 +125,7 @@ struct LookupData
QByteArray exp; QByteArray exp;
}; };
typedef QMultiHash<int, LookupData> LookupItems; // id -> (iname, exp) typedef QHash<int, LookupData> LookupItems; // id -> (iname, exp)
class QmlEnginePrivate : QmlDebugClient class QmlEnginePrivate : QmlDebugClient
{ {
@@ -1375,8 +1375,14 @@ void QmlEnginePrivate::lookup(const LookupItems &items)
if (items.isEmpty()) if (items.isEmpty())
return; return;
QList<int> handles = items.keys(); QList<int> handles;
currentlyLookingUp += items; for (auto it = items.begin(); it != items.end(); ++it) {
const int handle = it.key();
if (!currentlyLookingUp.contains(handle)) {
currentlyLookingUp.insert(handle, it.value());
handles.append(handle);
}
}
DebuggerCommand cmd(LOOKUP); DebuggerCommand cmd(LOOKUP);
cmd.arg(HANDLES, handles); cmd.arg(HANDLES, handles);