From 5690f0c32ec2f0ac0d345da1da23178357b28e26 Mon Sep 17 00:00:00 2001 From: Name1e5s <836401406@qq.com> Date: Mon, 7 Feb 2022 17:06:03 +0800 Subject: [PATCH] metrics: fix build on mips (#4475) --- tokio/src/macros/cfg.rs | 8 ++++---- tokio/src/runtime/metrics/worker.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs index 3b8fd3a7890..3836aa78b9d 100644 --- a/tokio/src/macros/cfg.rs +++ b/tokio/src/macros/cfg.rs @@ -177,9 +177,9 @@ macro_rules! cfg_macros { macro_rules! cfg_metrics { ($($item:item)*) => { $( - // For now, metrics is always enabled. When stabilized, it might - // have a dedicated feature flag. - #[cfg(tokio_unstable)] + // For now, metrics is only disabled in loom tests. + // When stabilized, it might have a dedicated feature flag. + #[cfg(all(tokio_unstable, not(loom)))] #[cfg_attr(docsrs, doc(cfg(tokio_unstable)))] $item )* @@ -189,7 +189,7 @@ macro_rules! cfg_metrics { macro_rules! cfg_not_metrics { ($($item:item)*) => { $( - #[cfg(not(tokio_unstable))] + #[cfg(not(all(tokio_unstable, not(loom))))] $item )* } diff --git a/tokio/src/runtime/metrics/worker.rs b/tokio/src/runtime/metrics/worker.rs index ec59ce04730..c9b85e48e4c 100644 --- a/tokio/src/runtime/metrics/worker.rs +++ b/tokio/src/runtime/metrics/worker.rs @@ -1,5 +1,5 @@ -use std::sync::atomic::Ordering::Relaxed; -use std::sync::atomic::{AtomicU64, AtomicUsize}; +use crate::loom::sync::atomic::Ordering::Relaxed; +use crate::loom::sync::atomic::{AtomicU64, AtomicUsize}; /// Retreive runtime worker metrics. ///