Simplify driver API

Cargo.toml

@@ -13,8 +13,7 @@ futures = { version = "0.3", default-features = false }
 toml = { version = "0.8", default-features = false }
 tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
-tracing = { version = "0.1", default-features = false }
-tracing-futures = { version = "0.2", default-features = false }
+tracing = { version = "0.1", default-features = false, features = ["attributes"] }
 tracing-subscriber = { version = "0.3", default-features = false }
 serde = { version = "1", default-features = false, features = ["rc"] }
 serde_json = { version = "1", default-features = false }

drivers/drmem-drv-ntp/Cargo.toml

@@ -24,9 +24,6 @@ tokio.features = ["net", "time", "macros"]
 tracing.workspace = true
 tracing.default-features = false
 
-tracing-futures.workspace = true
-tracing-futures.default-features = false
-
 tracing-subscriber.workspace = true
 tracing-subscriber.default-features = false
 

drivers/drmem-drv-ntp/src/lib.rs

@@ -1,17 +1,15 @@
 use drmem_api::{
     device,
-    driver::{self, DriverConfig},
+    driver::{self, DriverConfig, ResettableState},
     Error, Result,
 };
 use std::convert::Infallible;
 use std::future::Future;
-use std::sync::Arc;
 use std::{
     net::{SocketAddr, SocketAddrV4},
     str,
 };
 use tokio::net::UdpSocket;
-use tokio::sync::Mutex;
 use tokio::time::{self, Duration};
 use tracing::{debug, error, trace, warn, Span};
 
@@ -428,9 +426,9 @@ impl driver::API for Instance {
         }
     }
 
-    async fn run(
-        &mut self,
-        devices: Arc<Mutex<Self::HardwareType>>,
+    async fn run<'a>(
+        &'a mut self,
+        devices: &'a mut Self::HardwareType,
     ) -> Infallible {
         // Record the peer's address in the "cfg" field of the span.
 
@@ -451,8 +449,6 @@ impl driver::API for Instance {
         let mut info = Some(server::Info::bad_value());
         let mut interval = time::interval(Duration::from_millis(20_000));
 
-        let mut devices = devices.lock().await;
-
         loop {
             interval.tick().await;
 
@@ -536,3 +532,5 @@ mod tests {
             .is_none());
     }
 }
+
+impl ResettableState for Devices {}

drivers/drmem-drv-sump/Cargo.toml

@@ -27,9 +27,6 @@ tokio.features = ["net", "io-util", "time"]
 tracing.workspace = true
 tracing.default-features = false
 
-tracing-futures.workspace = true
-tracing-futures.default-features = false
-
 tracing-subscriber.workspace = true
 tracing-subscriber.default-features = false