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

chore: use unsync loads for unsync_load (#7073)

Browse Source 
This reverts #6203 and #6179.
This commit is contained in:
Alice Ryhl 2025-01-06 14:16:15 +01:00 committed by GitHub
parent 67f127769b
commit e8f39157b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tokio/src/loom/std/atomic_u16.rs
View File

@ -26,8 +26,7 @@ impl AtomicU16 {
/// All mutations must have happened before the unsynchronized load. /// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations. /// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> u16 { pub(crate) unsafe fn unsync_load(&self) -> u16 {
// See <https://github.com/tokio-rs/tokio/issues/6155> core::ptr::read(self.inner.get() as *const u16)
self.load(std::sync::atomic::Ordering::Relaxed)
} }
} }

3
tokio/src/loom/std/atomic_u32.rs
View File

@ -26,8 +26,7 @@ impl AtomicU32 {
/// All mutations must have happened before the unsynchronized load. /// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations. /// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> u32 { pub(crate) unsafe fn unsync_load(&self) -> u32 {
// See <https://github.com/tokio-rs/tokio/issues/6155> core::ptr::read(self.inner.get() as *const u32)
self.load(std::sync::atomic::Ordering::Relaxed)
} }
} }

3
tokio/src/loom/std/atomic_usize.rs
View File

@ -26,8 +26,7 @@ impl AtomicUsize {
/// All mutations must have happened before the unsynchronized load. /// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations. /// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> usize { pub(crate) unsafe fn unsync_load(&self) -> usize {
// See <https://github.com/tokio-rs/tokio/issues/6155> core::ptr::read(self.inner.get() as *const usize)
self.load(std::sync::atomic::Ordering::Relaxed)
} }
pub(crate) fn with_mut<R>(&mut self, f: impl FnOnce(&mut usize) -> R) -> R { pub(crate) fn with_mut<R>(&mut self, f: impl FnOnce(&mut usize) -> R) -> R {