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

Cdb: Update locals via doUpdateLocals form DebuggerEngine.

Browse Source 
Change-Id: I2178e4d787a4d6811bbe5c6baddd23013954e53f
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
David Schulz
2015-06-11 12:32:10 +02:00
committed by hjk
parent f79f91fe45
commit ec83581d16
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1406,8 +1406,9 @@ void CdbEngine::activateFrame(int index)
updateLocals(); updateLocals();
} }
void CdbEngine::updateLocals() void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
{ {
Q_UNUSED(updateParameters)
typedef QHash<QByteArray, int> WatcherHash; typedef QHash<QByteArray, int> WatcherHash;
const int frameIndex = stackHandler()->currentIndex(); const int frameIndex = stackHandler()->currentIndex();
@@ -1420,7 +1421,6 @@ void CdbEngine::updateLocals()
watchHandler()->removeAllData(); watchHandler()->removeAllData();
return; return;
} }
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.
@@ -1469,7 +1469,6 @@ void CdbEngine::updateLocals()
// Required arguments: frame // Required arguments: frame
str << blankSeparator << frameIndex; str << blankSeparator << frameIndex;
watchHandler()->notifyUpdateStarted();
postExtensionCommand("locals", arguments, 0, postExtensionCommand("locals", arguments, 0,
[this](const CdbResponse &r) { handleLocals(r, true); }); [this](const CdbResponse &r) { handleLocals(r, true); });
} }

2
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -247,7 +247,7 @@ private:
void handleAdditionalQmlStack(const CdbResponse &response); void handleAdditionalQmlStack(const CdbResponse &response);
NormalizedSourceFileName sourceMapNormalizeFileNameFromDebugger(const QString &f); NormalizedSourceFileName sourceMapNormalizeFileNameFromDebugger(const QString &f);
void updateLocalVariable(const QByteArray &iname); void updateLocalVariable(const QByteArray &iname);
void updateLocals(); void doUpdateLocals(const UpdateParameters &params) override;
void updateAll() override; void updateAll() override;
int elapsedLogTime() const; int elapsedLogTime() const;
void addLocalsOptions(ByteArrayInputStream &s) const; void addLocalsOptions(ByteArrayInputStream &s) const;