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

task: use NonZeroU64 for task::Id (#6733)

Browse Source
This commit is contained in:
Motoyuki Kimura 2024-08-01 23:45:35 +09:00 committed by GitHub
parent 1077b0b29d
commit 338e13b04b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tokio/src/runtime/task/id.rs
View File

@ -1,6 +1,6 @@
use crate::runtime::context; use crate::runtime::context;
use std::fmt; use std::{fmt, num::NonZeroU64};
/// An opaque ID that uniquely identifies a task relative to all other currently /// An opaque ID that uniquely identifies a task relative to all other currently
/// running tasks. /// running tasks.
@ -24,7 +24,7 @@ use std::fmt;
#[cfg_attr(docsrs, doc(cfg(all(feature = "rt", tokio_unstable))))] #[cfg_attr(docsrs, doc(cfg(all(feature = "rt", tokio_unstable))))]
#[cfg_attr(not(tokio_unstable), allow(unreachable_pub))] #[cfg_attr(not(tokio_unstable), allow(unreachable_pub))]
#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
pub struct Id(pub(crate) u64); pub struct Id(pub(crate) NonZeroU64);
/// Returns the [`Id`] of the currently running task. /// Returns the [`Id`] of the currently running task.
/// ///
@ -78,21 +78,22 @@ impl Id {
use crate::loom::sync::atomic::StaticAtomicU64; 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: StaticAtomicU64 = StaticAtomicU64::new(1);
}
Self(NEXT_ID.fetch_add(1, Relaxed))
} }
#[cfg(not(all(test, loom)))] #[cfg(not(all(test, loom)))]
{ static NEXT_ID: StaticAtomicU64 = StaticAtomicU64::new(1);
static NEXT_ID: StaticAtomicU64 = StaticAtomicU64::new(1);
Self(NEXT_ID.fetch_add(1, Relaxed)) loop {
let id = NEXT_ID.fetch_add(1, Relaxed);
if let Some(id) = NonZeroU64::new(id) {
return Self(id);
}
} }
} }
pub(crate) fn as_u64(&self) -> u64 { pub(crate) fn as_u64(&self) -> u64 {
self.0 self.0.get()
} }
} }

2
tokio/src/runtime/task/mod.rs
View File

@ -532,6 +532,6 @@ unsafe impl<S> sharded_list::ShardedListItem for Task<S> {
unsafe fn get_shard_id(target: NonNull<Self::Target>) -> usize { unsafe fn get_shard_id(target: NonNull<Self::Target>) -> usize {
// SAFETY: The caller guarantees that `target` points at a valid task. // SAFETY: The caller guarantees that `target` points at a valid task.
let task_id = unsafe { Header::get_id(target) }; let task_id = unsafe { Header::get_id(target) };
task_id.0 as usize task_id.0.get() as usize
} }
} }