itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-09-25 12:00:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: fix implementation of unused RwLock::try_* methods (#7587)

Browse Source 
bd4ccae184b0359cb88f9ebc2ba157867e1eee0e introduced a wrapper for the
RwLock to get rid of poisoning aspects.

By mistake (?!) its try_read/write methods actually delegate to
read/write() and this would lead to blocking

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
This commit is contained in:
Martin Grigorov 2025-09-09 10:39:01 +03:00 committed by GitHub
parent 14e739c306
commit ac4c95972e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tokio/src/loom/std/parking_lot.rs
View File

@ -6,7 +6,7 @@
use std::fmt;
use std::marker::PhantomData;
use std::ops::{Deref, DerefMut};
use std::sync::LockResult;
use std::sync::{LockResult, TryLockError};
use std::time::Duration;
// All types in this file are marked with PhantomData to ensure that
@ -101,7 +101,9 @@ impl<T> RwLock<T> {
}
pub(crate) fn try_read(&self) -> Option<RwLockReadGuard<'_, T>> {
Some(RwLockReadGuard(PhantomData, self.1.read()))
self.1
.try_read()
.map(|guard| RwLockReadGuard(PhantomData, guard))
}
pub(crate) fn write(&self) -> RwLockWriteGuard<'_, T> {
@ -109,7 +111,9 @@ impl<T> RwLock<T> {
}
pub(crate) fn try_write(&self) -> Option<RwLockWriteGuard<'_, T>> {
Some(RwLockWriteGuard(PhantomData, self.1.write()))
self.1
.try_write()
.map(|guard| RwLockWriteGuard(PhantomData, guard))
}
}