Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

metrics: fix build on mips #4475

Merged
merged 2 commits into from Feb 7, 2022
Merged

metrics: fix build on mips #4475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c650186
metrics: fix build on mips
Feb 6, 2022
578daea
chore:disable metrics feature in loom tests
Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions tokio/src/macros/cfg.rs
View file
Open in desktop
Expand Up @@ -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
)*
Expand All @@ -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
)*
}
Expand Down
4 changes: 2 additions & 2 deletions tokio/src/runtime/metrics/worker.rs
View file
Open in desktop
@@ -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.
///
Expand Down