From 650c2568cf4a3d5e58036d56d8dfb2d9ff209499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Wed, 15 Dec 2021 00:40:52 +0100 Subject: [PATCH] Remove extended deadlock wait on macOS --- .github/workflows/pr_build.yml | 2 +- interface/src/Application.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 7f5ca3525d..824207dea8 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -156,7 +156,7 @@ jobs: sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1 else # macOS echo "Downloading MacOSX10.12 SDK.." - curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmdNLMCUCw8hBTqinkc7ke88WgRb7M2mWQbccQPDsyaub8?filename=macOS_SDK10.12.4.tar.xz" || exit 1 + curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://data.moto9000.moe/vircadia_packages/macOS_SDK10.12.4.tar.xz" || exit 1 echo " done\n" echo "Extracting MacOSX10.12 SDK.." tar -xf macOS_SDK10.12.4.tar.xz || exit 1 diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5d8e51311d..d3c10d2ea4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -381,12 +381,7 @@ const std::vector> 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