Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -242,7 +242,7 @@ public: · 241 unmodified lines | ||
| 242 | 242 | static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1; |
| 243 | 243 | static const unsigned long HEARTBEAT_REPORT_INTERVAL_USECS = 5 * USECS_PER_SECOND; |
| 244 | 244 | static const unsigned long MAX_HEARTBEAT_AGE_USECS = 30 * USECS_PER_SECOND; |
| 245 | − static const uint64_t WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large | |
| 245 | + static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large | |
| 246 | 246 | static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples |
| 247 | 247 | |
| 248 | 248 | // Set the heartbeat on launch |
| @@ -319,7 +319,7 @@ public: · 70 unmodified lines | ||
| 319 | 319 | |
| 320 | 320 | static std::atomic<uint64_t> _heartbeat; |
| 321 | 321 | static std::atomic<uint64_t> _lastReport; |
| 322 | − static std::atomic<int> _maxElapsed; | |
| 322 | + static std::atomic<uint64_t> _maxElapsed; | |
| 323 | 323 | static std::atomic<int> _maxElapsedAverage; |
| 324 | 324 | bool _quit { false }; |
| 325 | 325 | ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage; |
| @@ -327,7 +327,7 @@ public: · 1 unmodified line | ||
| 327 | 327 | |
| 328 | 328 | std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat; |
| 329 | 329 | std::atomic<uint64_t> DeadlockWatchdogThread::_lastReport; |
| 330 | −std::atomic<int> DeadlockWatchdogThread::_maxElapsed; | |
| 330 | +std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed; | |
| 331 | 331 | std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage; |
| 332 | 332 | |
| 333 | 333 | #ifdef Q_OS_WIN |