Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove extended deadlock wait on macOS

Browse source
This commit is contained in:
Julian Groß 2021-12-15 00:40:52 +01:00
parent d4a832a0c1
commit 650c2568cf
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pr_build.yml vendored
View file

@ -156,7 +156,7 @@ jobs:
sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1 sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
else # macOS else # macOS
echo "Downloading MacOSX10.12 SDK.." 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 " done\n"
echo "Extracting MacOSX10.12 SDK.." echo "Extracting MacOSX10.12 SDK.."
tar -xf macOS_SDK10.12.4.tar.xz || exit 1 tar -xf macOS_SDK10.12.4.tar.xz || exit 1

5
interface/src/Application.cpp
View file

@ -381,12 +381,7 @@ const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application:
class DeadlockWatchdogThread : public QThread { class DeadlockWatchdogThread : public QThread {
public: public:
static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1; 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 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 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