fix and improve

Author: jstarks

openhcl/underhill_core/src/inspect_internal.rs

@@ -44,16 +44,16 @@ use pal_async::task::Spawn;
 pub(crate) fn inspect_internal_diagnostics(
     req: Request<'_>,
     reinspect: &Sender<Deferred>,
-    driver: DefaultDriver,
+    driver: &DefaultDriver,
 ) {
     req.respond()
         .sensitivity_field("build_info", SensitivityLevel::Safe, build_info::get())
         .sensitivity_child("net", SensitivityLevel::Safe, |req| {
-            net(req, reinspect, driver)
+            net(req, reinspect.clone(), driver)
         });
 }
 
-fn net(req: Request<'_>, reinspect: &Sender<Deferred>, driver: DefaultDriver) {
+fn net(req: Request<'_>, reinspect: Sender<Deferred>, driver: &DefaultDriver) {
     let defer = req.defer();
     let driver2 = driver.clone();
     driver
@@ -83,7 +83,7 @@ fn net(req: Request<'_>, reinspect: &Sender<Deferred>, driver: DefaultDriver) {
 
                     // The existence of a mac address is always known to the host, so this can always be Safe.
                     resp.sensitivity_child(&mac_name, SensitivityLevel::Safe, |req| {
-                        net_nic(req, nic_entry.name, reinspect, driver2.clone());
+                        net_nic(req, nic_entry.name, reinspect.clone(), &driver2);
                     });
                 }
             })
@@ -93,7 +93,7 @@ fn net(req: Request<'_>, reinspect: &Sender<Deferred>, driver: DefaultDriver) {
 
 // net/mac_address
 // Format for mac address is no separators, lowercase letters, e.g. 00155d121212.
-fn net_nic(req: Request<'_>, name: String, reinspect: &Sender<Deferred>, driver: DefaultDriver) {
+fn net_nic(req: Request<'_>, name: String, reinspect: Sender<Deferred>, driver: &DefaultDriver) {
     let defer = req.defer();
     driver
         .spawn("inspect-diagnostics-net-nic", async move {
@@ -103,7 +103,7 @@ fn net_nic(req: Request<'_>, name: String, reinspect: &Sender<Deferred>, driver:
             let mut vm_inspection = InspectionBuilder::new(&format!("vm/{name}"))
                 .depth(Some(5))
                 .sensitivity(Some(SensitivityLevel::Sensitive))
-                .inspect(inspect::send(reinspect, |req| req));
+                .inspect(inspect::send(&reinspect, |req| req));
             vm_inspection.resolve().await;
 
             if let Node::Dir(nodes) = vm_inspection.results() {

openhcl/underhill_core/src/lib.rs

@@ -546,7 +546,7 @@ async fn run_control(
                                 inspect_internal::inspect_internal_diagnostics(
                                     req,
                                     &diag_reinspect_send,
-                                    driver.clone(),
+                                    &driver,
                                 )
                             });
 

openhcl/underhill_core/src/nvme_manager/device.rs

@@ -334,16 +334,13 @@ impl NvmeDriverManager {
 
 #[derive(Inspect, Debug, Clone)]
 pub struct NvmeDriverManagerClient {
-    pci_id: String,
     #[inspect(skip)]
+    pci_id: String,
+    #[inspect(flatten, send = "NvmeDriverRequest::Inspect")]
     sender: mesh::Sender<NvmeDriverRequest>,
 }
 
 impl NvmeDriverManagerClient {
-    pub fn send_inspect(&self, deferred: Deferred) {
-        self.sender.send(NvmeDriverRequest::Inspect(deferred));
-    }
-
     pub async fn get_namespace(&self, nsid: u32) -> anyhow::Result<nvme_driver::Namespace> {
         let span = tracing::info_span!(
             "nvme_device_manager_get_namespace",

openhcl/underhill_core/src/nvme_manager/manager.rs

@@ -198,40 +198,21 @@ struct NvmeWorkerContext {
     save_restore_supported: bool,
     #[inspect(skip)]
     driver_source: VmTaskDriverSource,
-    #[inspect(skip)]
+    #[inspect(with = "|x| inspect::adhoc(|req| inspect::iter_by_key(&*x.read()).inspect(req))")]
     devices: Arc<RwLock<HashMap<String, NvmeDriverManager>>>,
     #[inspect(skip)]
     nvme_driver_spawner: Arc<dyn CreateNvmeDriver>,
 }
 
 #[derive(Inspect)]
-#[inspect(extra = "NvmeManagerWorker::inspect_extra")]
 struct NvmeManagerWorker {
-    #[inspect(skip)]
+    #[inspect(with = "Vec::len")]
     tasks: Vec<Task<()>>,
+    #[inspect(flatten)]
     context: NvmeWorkerContext,
 }
 
 impl NvmeManagerWorker {
-    fn inspect_extra(&self, resp: &mut inspect::Response<'_>) {
-        resp.child("outstanding-tasks", |req| {
-            req.value(self.tasks.len());
-        });
-
-        resp.child("devices", |req| {
-            let devices = self.context.devices.read();
-            let mut resp = req.respond();
-            for (pci_id, driver) in devices.iter() {
-                resp.field(
-                    pci_id,
-                    inspect::adhoc(|req| {
-                        driver.client().send_inspect(req.defer());
-                    }),
-                );
-            }
-        });
-    }
-
     async fn run(&mut self, mut recv: mesh::Receiver<Request>) {
         let (join_span, nvme_keepalive) = loop {
             let Some(req) = recv.next().await else {