Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 13:26:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1547 from JulianGro/macOS_revert_deadlock

Browse source 
Remove extended deadlock wait on macOS
This commit is contained in:
Dale Glass 2021-12-26 20:27:36 +01:00 committed by GitHub
commit 08407b9736
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -381,12 +381,7 @@ const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application:
class DeadlockWatchdogThread : public QThread {
public:
static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
// TODO: go back to 2 min across the board, after figuring out the issues with mac
#if defined(Q_OS_MAC)
static const unsigned long MAX_HEARTBEAT_AGE_USECS = 600 * USECS_PER_SECOND; // 10 mins with no checkin probably a deadlock, right now, on MAC
#else
static const unsigned long MAX_HEARTBEAT_AGE_USECS = 120 * USECS_PER_SECOND; // 2 mins with no checkin probably a deadlock
#endif
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