Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 20:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more mac build busters

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-03-24 17:19:11 -07:00
parent 06a6a8462f
commit 5b13ebf72b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -242,7 +242,7 @@ public:
static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1; static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
static const unsigned long HEARTBEAT_REPORT_INTERVAL_USECS = 5 * USECS_PER_SECOND; static const unsigned long HEARTBEAT_REPORT_INTERVAL_USECS = 5 * USECS_PER_SECOND;
static const unsigned long MAX_HEARTBEAT_AGE_USECS = 30 * USECS_PER_SECOND; static const unsigned long MAX_HEARTBEAT_AGE_USECS = 30 * USECS_PER_SECOND;
static const uint64_t WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large
static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples
// Set the heartbeat on launch // Set the heartbeat on launch
@ -319,7 +319,7 @@ public:
static std::atomic<uint64_t> _heartbeat; static std::atomic<uint64_t> _heartbeat;
static std::atomic<uint64_t> _lastReport; static std::atomic<uint64_t> _lastReport;
static std::atomic<int> _maxElapsed; static std::atomic<uint64_t> _maxElapsed;
static std::atomic<int> _maxElapsedAverage; static std::atomic<int> _maxElapsedAverage;
bool _quit { false }; bool _quit { false };
ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage; ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage;
@ -327,7 +327,7 @@ public:
std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat; std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat;
std::atomic<uint64_t> DeadlockWatchdogThread::_lastReport; std::atomic<uint64_t> DeadlockWatchdogThread::_lastReport;
std::atomic<int> DeadlockWatchdogThread::_maxElapsed; std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed;
std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage; std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN