chore: handle std Mutex poisoning in a shim
#2872
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
zaharidichev
force-pushed
the
zd/no-poison-mutex-shim
branch
from
6a32314
to
b9bbd46
Compare
Darksonn
added
A-tokio
|
Looks like there is a conflict. |
As tokio does not rely on poisoning, we can avoid always unwrapping when locking by handling the `PoisonError` in the Mutex shim. Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
zaharidichev
force-pushed
the
zd/no-poison-mutex-shim
branch
from
5a7a6a1
to
7981985
Compare
|
resolved conflicts |
Darksonn
reviewed
Sep 25, 2020
Comment on lines
+17
to
+20
| #[inline] | ||
| pub(crate) fn lock(&self) -> MutexGuard<'_, T> { | ||
| self.0.lock().unwrap() | ||
| } |
There was a problem hiding this comment.
This doesn't really seem correct? Shouldn't it use into_inner? Or maybe it's good to panic on poisoning in loom tests?
There was a problem hiding this comment.
Poisoning in loom is good because we should never hit it.
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.
Motivation
As tokio does not rely on poisoning, we can
avoid always unwrapping when locking by handling
the
PoisonErrorin the Mutex shim.Solution
Provide a wrapper around std::sync::Mutex that uses
PoisonError::into_innerto ignore the poisoning aspectsof the std api.
Fix #2867
Signed-off-by: Zahari Dichev zaharidichev@gmail.com