[core] Ensure all lock guards are properly nested. #5646
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
Rather than implementing `Drop` for all three lock guard types to restore the lock analysis' per-thread state, let lock guards own values of a new type, `LockStateGuard`, with the appropriate `Drop` implementation. This is cleaner and shorter, and helps us implement `RwLock::downgrade` in a later commit.
Implement `RwLockWriteGuard::downgrade` for `lock::vanilla` and `lock::ranked`, to downgrade a write lock to a read lock.
The lock analyzers in the `wgpu_core::lock` module can be a bit simpler if they can assume that locks are acquired and released in a stack-like order: that a guard is only dropped when it is the most recently acquired lock guard still held. So: - Change `Device::maintain` to take a `RwLockReadGuard` for the device's hal fence, rather than just a reference to it. - Adjust the order in which guards are dropped in `Device::maintain` and `Queue::submit`. Fixes gfx-rs#5610.
|
The interesting thing for reviewers to consider here is the shifting of the code that assigns to |
|
|
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.
The lock analyzers in the
wgpu_core::lockmodule can be a bitsimpler if they can assume that locks are acquired and released in a
stack-like order: that a guard is only dropped when it is the most
recently acquired lock guard still held. So:
Change
Device::maintainto take aRwLockReadGuardfor the device's hal fence, rather than just a reference to it.Adjust the order in which guards are dropped in
Device::maintainandQueue::submit.Implement
downgradefor thelockmodule'sRwLocks.Implement
RwLockWriteGuard::downgradeforlock::vanillaandlock::ranked, to downgrade a write lock to a read lock.Refactor
lock::rankedto useLockStateGuard.Rather than implementing
Dropfor all three lock guard types to restore the lock analysis' per-thread state, let lock guards own values of a new type,LockStateGuard, with the appropriateDropimplementation. This is cleaner and shorter, and helps us implementRwLock::downgradein a later commit.Fixes #5610.