Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 13:49:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15556 from jherico/fix/watchdog_spam

Browse source 
BUGZ-131: Additional silencing of watchdog spam
This commit is contained in:
Shannon Romano 2019-05-14 08:10:02 -07:00 committed by GitHub
commit 8597a51657
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -441,6 +441,7 @@ public:
auto elapsedMovingAverage = _movingAverage.getAverage(); auto elapsedMovingAverage = _movingAverage.getAverage();
if (elapsedMovingAverage > _maxElapsedAverage) { if (elapsedMovingAverage > _maxElapsedAverage) {
#if !defined(NDEBUG)
qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
<< "lastHeartbeatAge:" << lastHeartbeatAge << "lastHeartbeatAge:" << lastHeartbeatAge
<< "elapsedMovingAverage:" << elapsedMovingAverage << "elapsedMovingAverage:" << elapsedMovingAverage
@ -448,9 +449,11 @@ public:
<< "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage
<< "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **" << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **"
<< "samples:" << _movingAverage.getSamples(); << "samples:" << _movingAverage.getSamples();
#endif
_maxElapsedAverage = elapsedMovingAverage; _maxElapsedAverage = elapsedMovingAverage;
} }
if (lastHeartbeatAge > _maxElapsed) { if (lastHeartbeatAge > _maxElapsed) {
#if !defined(NDEBUG)
qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
<< "lastHeartbeatAge:" << lastHeartbeatAge << "lastHeartbeatAge:" << lastHeartbeatAge
<< "elapsedMovingAverage:" << elapsedMovingAverage << "elapsedMovingAverage:" << elapsedMovingAverage
@ -458,8 +461,11 @@ public:
<< "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **" << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **"
<< "maxElapsedAverage:" << _maxElapsedAverage << "maxElapsedAverage:" << _maxElapsedAverage
<< "samples:" << _movingAverage.getSamples(); << "samples:" << _movingAverage.getSamples();
#endif
_maxElapsed = lastHeartbeatAge; _maxElapsed = lastHeartbeatAge;
} }
#if !defined(NDEBUG)
if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) { if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) {
qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
<< "lastHeartbeatAge:" << lastHeartbeatAge << "lastHeartbeatAge:" << lastHeartbeatAge
@ -468,6 +474,7 @@ public:
<< "maxElapsedAverage:" << _maxElapsedAverage << "maxElapsedAverage:" << _maxElapsedAverage
<< "samples:" << _movingAverage.getSamples(); << "samples:" << _movingAverage.getSamples();
} }
#endif
if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) { if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) {
qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- " qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- "