--wip-- [skip ci]

Author: GuillaumeLagrange

crates/instrument-hooks-bindings/instrument-hooks

@@ -39,7 +39,7 @@ async fn setup(setup_cache_dir: Option<&Path>) -> Result<()> {
                     system_info.os
                 );
             }
-            ExecutorSupport::RequiresManualSetup => {
+            ExecutorSupport::RequiresManualInstallation => {
                 info!(
                     "Skipping automatic setup for the {} executor on {}; install required tooling manually.",
                     executor.name(),

src/cli/setup.rs

@@ -79,8 +79,7 @@ impl Executor for MemoryExecutor {
 
     fn support_level(&self, os: &Os) -> ExecutorSupport {
         match os {
-            Os::SupportedLinux { .. } => ExecutorSupport::FullySupported,
-            Os::OtherLinux { .. } => ExecutorSupport::RequiresManualSetup,
+            Os::SupportedLinux { .. } | Os::OtherLinux { .. } => ExecutorSupport::FullySupported,
             Os::MacOs { .. } | Os::Unsupported { .. } => ExecutorSupport::Unsupported,
         }
     }

src/executor/memory/executor.rs

@@ -78,9 +78,8 @@ pub enum ToolInstallStatus {
 pub enum ExecutorSupport {
     /// The executor cannot run on this OS at all — `run_executor` hard-bails.
     Unsupported,
-    /// The executor runs on this OS, but the user is responsible for installing the required
-    /// tooling themselves; `setup()` is skipped.
-    RequiresManualSetup,
+    /// The executor runs on this OS, but the user is responsible for installing the required tooling themselves.
+    RequiresManualInstallation,
     /// The executor runs on this OS and `setup()` knows how to auto-install tooling.
     FullySupported,
 }
@@ -90,7 +89,7 @@ pub trait Executor {
     fn name(&self) -> ExecutorName;
 
     /// Report the installation status of the tool(s) this executor depends on.
-    fn tool_status(&self) -> ToolStatus;
+    fn tool_status(&self) -> Option<ToolStatus>;
 
     /// Declare how well this executor runs on the host OS. Drives whether `setup()` is invoked
     /// (only when [`ExecutorSupport::FullySupported`]) and whether we bail out of running the
@@ -132,16 +131,7 @@ pub async fn run_executor(
                 orchestrator.system_info.os
             );
         }
-        ExecutorSupport::RequiresManualSetup => {
-            if !execution_context.config.skip_setup {
-                info!(
-                    "Skipping automatic setup for the {} executor on {}; ensure required tooling is installed manually.",
-                    executor.name(),
-                    orchestrator.system_info.os
-                );
-            }
-        }
-        ExecutorSupport::FullySupported => {
+        ExecutorSupport::RequiresManualInstallation | ExecutorSupport::FullySupported => {
             if !execution_context.config.skip_setup {
                 executor
                     .setup(&orchestrator.system_info, setup_cache_dir)

src/executor/mod.rs

@@ -26,7 +26,7 @@ impl Executor for ValgrindExecutor {
     fn support_level(&self, os: &Os) -> ExecutorSupport {
         match os {
             Os::SupportedLinux { .. } => ExecutorSupport::FullySupported,
-            Os::OtherLinux { .. } => ExecutorSupport::RequiresManualSetup,
+            Os::OtherLinux { .. } => ExecutorSupport::RequiresManualInstallation,
             Os::MacOs { .. } | Os::Unsupported { .. } => ExecutorSupport::Unsupported,
         }
     }

src/executor/valgrind/executor.rs

@@ -121,22 +121,14 @@ impl Executor for WallTimeExecutor {
         ExecutorName::WallTime
     }
 
-    fn tool_status(&self) -> ToolStatus {
-        if self.perf.is_some() {
-            super::perf::setup::get_perf_status()
-        } else {
-            // No profiler tool wired up on this OS yet — report as not installed.
-            ToolStatus {
-                tool_name: "perf".to_string(),
-                status: crate::executor::ToolInstallStatus::NotInstalled,
-            }
-        }
+    fn tool_status(&self) -> Option<ToolStatus> {
+        self.perf.map(|_| super::perf::setup::get_perf_status())
     }
 
     fn support_level(&self, os: &Os) -> ExecutorSupport {
         match os {
             Os::SupportedLinux { .. } | Os::MacOs { .. } => ExecutorSupport::FullySupported,
-            Os::OtherLinux { .. } => ExecutorSupport::RequiresManualSetup,
+            Os::OtherLinux { .. } => ExecutorSupport::RequiresManualInstallation,
             Os::Unsupported { .. } => ExecutorSupport::Unsupported,
         }
     }

src/executor/wall_time/executor.rs

@@ -7,7 +7,7 @@ use super::{Os, SystemInfo};
 /// This is a blunt global check; per-executor support is handled separately via
 /// [`crate::executor::Executor::support_level`].
 pub fn check_system(system_info: &SystemInfo) -> Result<()> {
-    debug!("System info: {system_info:#?}");
+    dbg!("System info: {system_info:#?}");
 
     match &system_info.os {
         Os::SupportedLinux { .. } | Os::MacOs { .. } => Ok(()),