Repository navigation
Prevent MediaPauseController queue hang on osascript timeout - #327
Open
toufiqfarhan0 wants to merge 1 commit into
Open
toufiqfarhan0 wants to merge 1 commit into
toufiqfarhan0 wants to merge 1 commit into
Conversation
This branch has not been deployed
This file contains hidden or 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
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.
Fixes #325
Problem
In
MediaPauseController.runOSA, when anosascriptprocess exceeded its 5-second timeout,process.terminate()was called to sendSIGTERM, followed by an unboundedexited.wait():If
/usr/bin/osascriptwas wedged (e.g. hanging on synchronous AppleEvent IPC with a hung media player or modal dialog), it would not terminate upon receivingSIGTERM. Callingexited.wait()with no timeout blockedMediaPauseController.queue(a serialDispatchQueue) permanently. Consequently:pause()orresumePaused()invocation queued ontoSelf.queueblocked indefinitely.restoreBeforeExit()queues ontoSelf.queueand waits up toexitBudget(2s), causing the app to hang on shutdown while failing to resume playback.Fix
killGraceTimeout = DispatchTimeInterval.milliseconds(500).SIGTERM, escalate tokill(process.processIdentifier, SIGKILL).killGraceTimeoutas well soMediaPauseController.queueis guaranteed never to block indefinitely.Verification
scripts/check-invariants.shpassed (all 14 architectural invariants hold).scripts/check-portability.shpassed.