Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -441,6 +441,7 @@ public: · 440 unmodified lines | |||
| 441 | auto elapsedMovingAverage = _movingAverage.getAverage(); | 441 | auto elapsedMovingAverage = _movingAverage.getAverage(); |
| 442 | 442 | ||
| 443 | if (elapsedMovingAverage > _maxElapsedAverage) { | 443 | if (elapsedMovingAverage > _maxElapsedAverage) { |
| 444 | #if !defined(NDEBUG) | ||
| 444 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" | 445 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" |
| 445 | << "lastHeartbeatAge:" << lastHeartbeatAge | 446 | << "lastHeartbeatAge:" << lastHeartbeatAge |
| 446 | << "elapsedMovingAverage:" << elapsedMovingAverage | 447 | << "elapsedMovingAverage:" << elapsedMovingAverage |
| @@ -448,9 +449,11 @@ public: · 1 unmodified line | |||
| 448 | << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage | 449 | << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage |
| 449 | << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **" | 450 | << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **" |
| 450 | << "samples:" << _movingAverage.getSamples(); | 451 | << "samples:" << _movingAverage.getSamples(); |
| 452 | #endif | ||
| 451 | _maxElapsedAverage = elapsedMovingAverage; | 453 | _maxElapsedAverage = elapsedMovingAverage; |
| 452 | } | 454 | } |
| 453 | if (lastHeartbeatAge > _maxElapsed) { | 455 | if (lastHeartbeatAge > _maxElapsed) { |
| 456 | #if !defined(NDEBUG) | ||
| 454 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" | 457 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" |
| 455 | << "lastHeartbeatAge:" << lastHeartbeatAge | 458 | << "lastHeartbeatAge:" << lastHeartbeatAge |
| 456 | << "elapsedMovingAverage:" << elapsedMovingAverage | 459 | << "elapsedMovingAverage:" << elapsedMovingAverage |
| @@ -458,8 +461,11 @@ public: · 1 unmodified line | |||
| 458 | << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **" | 461 | << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **" |
| 459 | << "maxElapsedAverage:" << _maxElapsedAverage | 462 | << "maxElapsedAverage:" << _maxElapsedAverage |
| 460 | << "samples:" << _movingAverage.getSamples(); | 463 | << "samples:" << _movingAverage.getSamples(); |
| 464 | #endif | ||
| 461 | _maxElapsed = lastHeartbeatAge; | 465 | _maxElapsed = lastHeartbeatAge; |
| 462 | } | 466 | } |
| 467 | |||
| 468 | #if !defined(NDEBUG) | ||
| 463 | if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) { | 469 | if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) { |
| 464 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" | 470 | qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:" |
| 465 | << "lastHeartbeatAge:" << lastHeartbeatAge | 471 | << "lastHeartbeatAge:" << lastHeartbeatAge |
| @@ -468,6 +474,7 @@ public: · 2 unmodified lines | |||
| 468 | << "maxElapsedAverage:" << _maxElapsedAverage | 474 | << "maxElapsedAverage:" << _maxElapsedAverage |
| 469 | << "samples:" << _movingAverage.getSamples(); | 475 | << "samples:" << _movingAverage.getSamples(); |
| 470 | } | 476 | } |
| 477 | #endif | ||
| 471 | 478 | ||
| 472 | if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) { | 479 | if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) { |
| 473 | qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- " | 480 | qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- " |