tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-27 00:00:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

loom: remove StaticAtomicU64 (#7902)

Browse Source
This commit is contained in:
winlogon
2026-03-04 16:16:50 +01:00
committed by GitHub
parent 0273e45ead
commit a502d1b5c8
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/src/loom/mocked.rs
-7
View File
@@ -58,13 +58,6 @@ pub(crate) mod sync {
} }
pub(crate) use loom::sync::*; pub(crate) use loom::sync::*;
pub(crate) mod atomic {
pub(crate) use loom::sync::atomic::*;
// TODO: implement a loom version
pub(crate) type StaticAtomicU64 = std::sync::atomic::AtomicU64;
}
} }
pub(crate) mod rand { pub(crate) mod rand {
tokio/src/loom/std/atomic_u64.rs
+1 -1
View File
@@ -16,4 +16,4 @@ cfg_not_has_atomic_u64! {
mod imp; mod imp;
} }
pub(crate) use imp::{AtomicU64, StaticAtomicU64}; pub(crate) use imp::AtomicU64;
tokio/src/loom/std/mod.rs
+1 -1
View File
@@ -71,7 +71,7 @@ pub(crate) mod sync {
pub(crate) mod atomic { pub(crate) mod atomic {
pub(crate) use crate::loom::std::atomic_u16::AtomicU16; pub(crate) use crate::loom::std::atomic_u16::AtomicU16;
pub(crate) use crate::loom::std::atomic_u32::AtomicU32; pub(crate) use crate::loom::std::atomic_u32::AtomicU32;
pub(crate) use crate::loom::std::atomic_u64::{AtomicU64, StaticAtomicU64}; pub(crate) use crate::loom::std::atomic_u64::AtomicU64;
pub(crate) use crate::loom::std::atomic_usize::AtomicUsize; pub(crate) use crate::loom::std::atomic_usize::AtomicUsize;
pub(crate) use std::sync::atomic::{fence, AtomicBool, AtomicPtr, AtomicU8, Ordering}; pub(crate) use std::sync::atomic::{fence, AtomicBool, AtomicPtr, AtomicU8, Ordering};
tokio/src/runtime/task/id.rs
+3 -4
View File
@@ -67,16 +67,15 @@ impl fmt::Display for Id {
impl Id { impl Id {
pub(crate) fn next() -> Self { pub(crate) fn next() -> Self {
use crate::loom::sync::atomic::Ordering::Relaxed; use crate::loom::sync::atomic::{AtomicU64, Ordering::Relaxed};
use crate::loom::sync::atomic::StaticAtomicU64;
#[cfg(all(test, loom))] #[cfg(all(test, loom))]
crate::loom::lazy_static! { crate::loom::lazy_static! {
static ref NEXT_ID: StaticAtomicU64 = StaticAtomicU64::new(1); static ref NEXT_ID: AtomicU64 = AtomicU64::new(1);
} }
#[cfg(not(all(test, loom)))] #[cfg(not(all(test, loom)))]
static NEXT_ID: StaticAtomicU64 = StaticAtomicU64::new(1); static NEXT_ID: AtomicU64 = AtomicU64::new(1);
loop { loop {
let id = NEXT_ID.fetch_add(1, Relaxed); let id = NEXT_ID.fetch_add(1, Relaxed);
tokio/src/runtime/thread_id.rs
+8 -2
View File
@@ -5,9 +5,15 @@ pub(crate) struct ThreadId(NonZeroU64);
impl ThreadId { impl ThreadId {
pub(crate) fn next() -> Self { pub(crate) fn next() -> Self {
use crate::loom::sync::atomic::{Ordering::Relaxed, StaticAtomicU64}; use crate::loom::sync::atomic::{AtomicU64, Ordering::Relaxed};
static NEXT_ID: StaticAtomicU64 = StaticAtomicU64::new(0); #[cfg(all(test, loom))]
crate::loom::lazy_static! {
static ref NEXT_ID: AtomicU64 = AtomicU64::new(0);
}
#[cfg(not(all(test, loom)))]
static NEXT_ID: AtomicU64 = AtomicU64::new(0);
let mut last = NEXT_ID.load(Relaxed); let mut last = NEXT_ID.load(Relaxed);
loop { loop {