Remove extended deadlock wait on macOS #1547
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JulianGro
added
housekeeping
HifiExperiments
approved these changes
Dec 20, 2021
| @@ -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 | |||
There was a problem hiding this comment.
hm I forget what this was for. there might have been issues on startup? or…shutdown?
There was a problem hiding this comment.
Whatever this was for, we don't know and the issue might not be a thing anymore. If there is a heartbeat taking over two minutes to complete, I feel like we should find out rather than just leaving it like this.
|
The following links are available: build (ubuntu-18.04, full)
build (macOS-10.15, full) build (windows-latest, full) build (self-hosted_debian-11_aarch64, full)
|
Conflicts: .github/workflows/pr_build.yml
|
The following links are available: build (ubuntu-18.04, full)
build (macOS-10.15, client) build (windows-latest, full) build (self-hosted_debian-11_aarch64, full)
|
digisomni
added
CR Approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removes a weird workaround from HiFi times.
Whatever the reason for this was, it basically breaks crashpad for deadlocks because no one is going to sit around and wait 10 minutes for Interface to detect a deadlock when it is not responsive.
Two minutes already seems like quite a stretch in most cases.