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

CDB: Using watchdata cache to highlight value changes.

Browse Source 
Change-Id: I05a8184bb79c2907a4aa0fec13cc809237eead45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
David Schulz
2014-04-28 13:36:03 +02:00
committed by hjk
parent 5dc3dcc11a
commit 3434420cde
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -83,11 +83,7 @@ enum { debugSourceMapping = 0 };
enum { debugWatches = 0 }; enum { debugWatches = 0 };
enum { debugBreakpoints = 0 }; enum { debugBreakpoints = 0 };
enum HandleLocalsFlags enum { LocalsUpdateForNewFrame = 0x1 };
{
PartialLocalsUpdate = 0x1,
LocalsUpdateForNewFrame = 0x2
};
#if 0 #if 0
# define STATE_DEBUG(state, func, line, notifyFunc) qDebug("%s in %s at %s:%d", notifyFunc, stateName(state), func, line); # define STATE_DEBUG(state, func, line, notifyFunc) qDebug("%s in %s at %s:%d", notifyFunc, stateName(state), func, line);
@@ -1096,9 +1092,7 @@ void CdbEngine::updateLocalVariable(const QByteArray &iname)
} }
str << blankSeparator << iname; str << blankSeparator << iname;
postExtensionCommand(isWatch ? "watches" : "locals", postExtensionCommand(isWatch ? "watches" : "locals",
localsArguments, 0, localsArguments, 0, &CdbEngine::handleLocals);
&CdbEngine::handleLocals,
0, QVariant(int(PartialLocalsUpdate)));
} }
bool CdbEngine::hasCapability(unsigned cap) const bool CdbEngine::hasCapability(unsigned cap) const
@@ -1503,6 +1497,8 @@ void CdbEngine::updateLocals(bool forNewStackFrame)
watchHandler()->removeAllData(); watchHandler()->removeAllData();
return; return;
} }
if (forNewStackFrame)
watchHandler()->resetValueCache();
/* Watchers: Forcibly discard old symbol group as switching from /* Watchers: Forcibly discard old symbol group as switching from
* thread 0/frame 0 -> thread 1/assembly -> thread 0/frame 0 will otherwise re-use it * thread 0/frame 0 -> thread 1/assembly -> thread 0/frame 0 will otherwise re-use it
* and cause errors as it seems to go 'stale' when switching threads. * and cause errors as it seems to go 'stale' when switching threads.
@@ -1934,8 +1930,6 @@ void CdbEngine::handleRegisters(const CdbExtensionCommandPtr &reply)
void CdbEngine::handleLocals(const CdbExtensionCommandPtr &reply) void CdbEngine::handleLocals(const CdbExtensionCommandPtr &reply)
{ {
const int flags = reply->cookie.toInt(); const int flags = reply->cookie.toInt();
if (!(flags & PartialLocalsUpdate))
watchHandler()->removeAllData();
if (reply->success) { if (reply->success) {
if (debuggerCore()->boolSetting(VerboseLog)) if (debuggerCore()->boolSetting(VerboseLog))
showMessage(QLatin1String("Locals: ") + QString::fromLatin1(reply->reply), LogDebug); showMessage(QLatin1String("Locals: ") + QString::fromLatin1(reply->reply), LogDebug);