merge

tokio/src/macros/cfg.rs

@@ -215,7 +215,6 @@ macro_rules! cfg_macros {
     }
 }
 
-// See https://github.com/tokio-rs/tokio/issues/6546, https://github.com/tokio-rs/tokio/issues/4073
 macro_rules! cfg_unstable_metrics {
     ($($item:item)*) => {
         $(
@@ -235,9 +234,13 @@ macro_rules! cfg_not_unstable_metrics {
     }
 }
 
-// Swap in mock metrics when loom is active
-macro_rules! cfg_not_metrics {
-    ($($item:item)*) => {};
+macro_rules! cfg_not_unstable_metrics {
+    ($($item:item)*) => {
+        $(
+            #[cfg(not(tokio_unstable))]
+            $item
+        )*
+    }
 }
 
 macro_rules! cfg_not_rt_and_metrics_and_net {
@@ -246,6 +249,18 @@ macro_rules! cfg_not_rt_and_metrics_and_net {
     };
 }
 
+macro_rules! cfg_net_and_unstable {
+    ($($item:item)*) => {
+        $(
+            #[cfg(tokio_unstable)]
+            #[cfg_attr(docsrs, doc(cfg(tokio_unstable)))]
+            #[cfg(feature = "net")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+            $item
+        )*
+    };
+}
+
 macro_rules! cfg_net_or_process {
     ($($item:item)*) => {
         $(

tokio/src/runtime/blocking/pool.rs

@@ -40,6 +40,7 @@ impl SpawnerMetrics {
         self.num_idle_threads.load(Ordering::Relaxed)
     }
 
+    // TODO(rcoh): why is this gated?
     cfg_unstable_metrics! {
         fn queue_depth(&self) -> usize {
             self.queue_depth.load(Ordering::Relaxed)

tokio/src/runtime/handle.rs

@@ -22,6 +22,8 @@ use std::future::Future;
 use std::marker::PhantomData;
 use std::{error, fmt};
 
+use super::RuntimeMetrics;
+
 /// Runtime context guard.
 ///
 /// Returned by [`Runtime::enter`] and [`Handle::enter`], the context guard exits
@@ -393,24 +395,9 @@ impl Handle {
             owned_id.into()
         }
     }
-}
 
-use crate::runtime::RuntimeMetrics;
-
-impl Handle {
     /// Returns a view that lets you get information about how the runtime
     /// is performing.
-    ///
-    /// # Examples
-    /// ```
-    /// use tokio::runtime::Handle;
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///   let metrics = Handle::current().metrics();
-    ///   println!("The runtime has {} workers", metrics.num_workers());
-    /// }
-    /// ```
     pub fn metrics(&self) -> RuntimeMetrics {
         RuntimeMetrics::new(self.clone())
     }

tokio/src/runtime/metrics/histogram.rs

@@ -1,4 +1,5 @@
-use std::sync::atomic::{AtomicU64, Ordering::Relaxed};
+use crate::util::metric_atomics::MetricAtomicU64;
+use std::sync::atomic::Ordering::Relaxed;
 
 use std::cmp;
 use std::ops::Range;

tokio/src/runtime/metrics/io.rs

@@ -1,6 +1,7 @@
 #![cfg_attr(not(feature = "net"), allow(dead_code))]
 
-use crate::loom::sync::atomic::{AtomicU64, Ordering::Relaxed};
+use crate::util::metric_atomics::MetricAtomicU64;
+use std::sync::atomic::Ordering::Relaxed;
 
 #[derive(Default)]
 pub(crate) struct IoDriverMetrics {

tokio/src/runtime/metrics/mod.rs

@@ -12,10 +12,12 @@ mod runtime;
 pub use runtime::RuntimeMetrics;
 
 cfg_unstable_metrics! {
-
     mod batch;
     pub(crate) use batch::MetricsBatch;
 
+cfg_unstable_metrics! {
+
+
     mod scheduler;
     pub(crate) use scheduler::SchedulerMetrics;