Merge pull request #7299 from zzmp/fix/deadlock-debug

Wait 10m for a deadlock when debugging
This commit is contained in:
Brad Davis 2016-03-09 14:10:02 -08:00
commit 98f791a723

View file

@ -239,7 +239,11 @@ class DeadlockWatchdogThread : public QThread {
public:
static const unsigned long HEARTBEAT_CHECK_INTERVAL_SECS = 1;
static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
#ifdef DEBUG
static const unsigned long MAX_HEARTBEAT_AGE_USECS = 600 * USECS_PER_SECOND;
#else
static const unsigned long MAX_HEARTBEAT_AGE_USECS = 10 * USECS_PER_SECOND;
#endif
// Set the heartbeat on launch
DeadlockWatchdogThread() {