Fix crash in PlayerCore.fileStarted, #3822 #4334
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
This commit will: - Add Atomic to PlaybackInfo.matchedSubs - Add a getMatchedSubs method to PlaybackInfo - Change AutoFileMatcher, PlayerCore and PlaylistViewController to hold a lock while accessing matchedSubs - Add Atomic to PlayerCore.backgroundQueueTicket - Change PlayerCore.fileStarted to hold a lock while incrementing backgroundQueueTicket - Add code to PlayerCore.stop that increments backgroundQueueTicket These changes insure the mutable Swift dictionary matchedSubs is only accessed by one thread at a time. Accessing a mutable dictionary from multiple threads without such coordination can result in a crash as seen in issue #3822. These changes also attempt to insure the background task that finds and loads subtitle files stops its work if playback is stopped before that process completes.
|
Reviewers should question whether the code patterns used for locking in the commit can be improved as such locking will need to be applied to other properties. |
1 task
uiryuu
approved these changes
Apr 17, 2023
23 tasks
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 commit will:
AtomictoPlaybackInfo.matchedSubsgetMatchedSubsmethod toPlaybackInfoAutoFileMatcher,PlayerCoreandPlaylistViewControllerto hold a lock while accessingmatchedSubsAtomictoPlayerCore.backgroundQueueTicketPlayerCore.fileStartedto hold a lock while incrementingbackgroundQueueTicketPlayerCore.stopthat incrementsbackgroundQueueTicketThese changes insure the mutable Swift dictionary
matchedSubsis only accessed by one thread at a time. Accessing a mutable dictionary from multiple threads without such coordination can result in a crash as seen in issue #3822.These changes also attempt to insure the background task that finds and loads subtitle files stops its work if playback is stopped before that process completes.
Description: