Avoid recursive snatch lock acquisitions #5426
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
SludgePhD
force-pushed
the
avoid-recursive-snatch
branch
2 times, most recently
from
d3d9643
to
315bbf3
Compare
Wumpf
requested changes
Mar 23, 2024
There was a problem hiding this comment.
Thank you very much for this fix!
Indeed not as nice to read as a solution than the recursive lock, but I think @jimblandy is right, this version is the way to go.
Extra thanks for adding the debug assertion in there to capture this sooner in the future.
Bunch of smaller things to fix up and then good to go!
Please also add a changelog entry about this fix.
SludgePhD
force-pushed
the
avoid-recursive-snatch
branch
from
4eae76f
to
108c086
Compare
Wumpf
requested changes
Mar 23, 2024
Wumpf
approved these changes
Mar 23, 2024
Closed
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.
Connections
Bug report: #5279
This PR is an alternative to #5400.
Description
Pass
&SnatchGuarddown to all functions needing it, instead of having them recursively acquire one.This also adds some instrumentation to the
SnatchLockAPI that will panic on any attempts to acquire it recursively (gated behindcfg(debug_assertions)). That should allow the test suite to catch any future misuse of the API, instead of silently making wgpu more deadlock-prone in multi-threaded applications.Testing
cargo xtask testlocally and on CIChecklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.