Fix lock-order inversion deadlock in AsyncCurrentValue#154
Merged
Conversation
Co-Authored-By: Galen Quinn <gqbit@users.noreply.github.com>
60e13cc to
8a7dd58
Compare
|
Contributor
|
Beautiful - thank you @bok-! |
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.



📒 Description
The previous implementation resumed pending continuations inside wrappedValue's didSet, which executed within the mutex lock. This created a lock-order inversion when a task cancellation raced a concurrent update: the update thread held the mutex and called continuation.resume() (which internally acquires Swift's task status lock), while the cancelling thread held the task status lock and entered the onCancel: handler (which attempted to acquire the mutex). Neither thread could proceed.
The fix moves continuation resumption outside the mutex. The update method now atomically captures the updated value, bumped generation, and pending continuations inside the lock, then resumes continuations after releasing it. No continuation can miss a generation because the registration and extraction of continuations happen within the same lock closure — any continuation arriving after the extraction will see the already-bumped generation and return immediately.
Fixes #153.
🗳 Test Plan
A regression test that reproduces the original race over 100,000 iterations is included.
✅ Checklist