Debugger: Move watchHandler()->notifyUpdateStarted() to doUpdateLocals

This was it also gets triggered when expanding tooltips.

Change-Id: I90ad39e9e82abdcd40e663b4ba4998205563009b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-06-16 16:38:14 +02:00
parent ad6451bbe4
commit d769efe1e2
4 changed files with 7 additions and 1 deletions

View File

@@ -1341,6 +1341,9 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
watchHandler()->removeAllData(); watchHandler()->removeAllData();
return; return;
} }
watchHandler()->notifyUpdateStarted();
/* 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.

View File

@@ -1551,7 +1551,6 @@ void DebuggerEngine::createSnapshot()
void DebuggerEngine::updateLocals() void DebuggerEngine::updateLocals()
{ {
watchHandler()->resetValueCache(); watchHandler()->resetValueCache();
watchHandler()->notifyUpdateStarted();
doUpdateLocals(UpdateParameters()); doUpdateLocals(UpdateParameters());
} }

View File

@@ -4660,6 +4660,8 @@ void GdbEngine::doUpdateLocals(const UpdateParameters &params)
{ {
m_pendingBreakpointRequests = 0; m_pendingBreakpointRequests = 0;
watchHandler()->notifyUpdateStarted();
DebuggerCommand cmd("showData"); DebuggerCommand cmd("showData");
watchHandler()->appendFormatRequests(&cmd); watchHandler()->appendFormatRequests(&cmd);

View File

@@ -864,6 +864,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters &params)
return; return;
} }
watchHandler()->notifyUpdateStarted();
DebuggerCommand cmd("updateData"); DebuggerCommand cmd("updateData");
cmd.arg("nativeMixed", isNativeMixedActive()); cmd.arg("nativeMixed", isNativeMixedActive());
watchHandler()->appendFormatRequests(&cmd); watchHandler()->appendFormatRequests(&cmd);