refactor: move common perf-map utility outside of valgrind helpers

Author: GuillaumeLagrange

src/executor/helpers/harvest_perf_maps_for_pids.rs

@@ -0,0 +1,35 @@
+use crate::prelude::*;
+use std::collections::HashSet;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+pub async fn harvest_perf_maps_for_pids(
+    profile_folder: &Path,
+    pids: &HashSet<libc::pid_t>,
+) -> Result<()> {
+    let perf_maps = pids
+        .iter()
+        .map(|pid| format!("perf-{pid}.map"))
+        .map(|file_name| {
+            (
+                PathBuf::from("/tmp").join(&file_name),
+                profile_folder.join(&file_name),
+            )
+        })
+        .filter(|(src_path, _)| src_path.exists())
+        .collect::<Vec<_>>();
+    debug!("Found {} perf maps", perf_maps.len());
+
+    for (src_path, dst_path) in perf_maps {
+        fs::copy(&src_path, &dst_path).map_err(|e| {
+            anyhow!(
+                "Failed to copy perf map file: {:?} to {}: {}",
+                src_path.file_name(),
+                profile_folder.display(),
+                e
+            )
+        })?;
+    }
+
+    Ok(())
+}

src/executor/helpers/mod.rs

@@ -2,6 +2,7 @@ pub mod apt;
 pub mod command;
 pub mod env;
 pub mod get_bench_command;
+pub mod harvest_perf_maps_for_pids;
 pub mod introspected_golang;
 pub mod introspected_nodejs;
 pub mod profile_folder;

src/executor/valgrind/helpers/perf_maps.rs

@@ -1,7 +1,8 @@
+use crate::executor::helpers::harvest_perf_maps_for_pids::harvest_perf_maps_for_pids;
 use crate::prelude::*;
 use std::collections::HashSet;
 use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 pub async fn harvest_perf_maps(profile_folder: &Path) -> Result<()> {
     // Get profile files (files with .out extension)
@@ -20,34 +21,3 @@ pub async fn harvest_perf_maps(profile_folder: &Path) -> Result<()> {
 
     harvest_perf_maps_for_pids(profile_folder, &pids).await
 }
-
-pub async fn harvest_perf_maps_for_pids(
-    profile_folder: &Path,
-    pids: &HashSet<libc::pid_t>,
-) -> Result<()> {
-    let perf_maps = pids
-        .iter()
-        .map(|pid| format!("perf-{pid}.map"))
-        .map(|file_name| {
-            (
-                PathBuf::from("/tmp").join(&file_name),
-                profile_folder.join(&file_name),
-            )
-        })
-        .filter(|(src_path, _)| src_path.exists())
-        .collect::<Vec<_>>();
-    debug!("Found {} perf maps", perf_maps.len());
-
-    for (src_path, dst_path) in perf_maps {
-        fs::copy(&src_path, &dst_path).map_err(|e| {
-            anyhow!(
-                "Failed to copy perf map file: {:?} to {}: {}",
-                src_path.file_name(),
-                profile_folder.display(),
-                e
-            )
-        })?;
-    }
-
-    Ok(())
-}

src/executor/wall_time/perf/mod.rs

@@ -4,13 +4,13 @@ use crate::cli::UnwindingMode;
 use crate::executor::Config;
 use crate::executor::helpers::command::CommandBuilder;
 use crate::executor::helpers::env::is_codspeed_debug_enabled;
+use crate::executor::helpers::harvest_perf_maps_for_pids::harvest_perf_maps_for_pids;
 use crate::executor::helpers::run_command_with_log_pipe::run_command_with_log_pipe_and_callback;
 use crate::executor::helpers::run_with_sudo::run_with_sudo;
 use crate::executor::helpers::run_with_sudo::wrap_with_sudo;
 use crate::executor::shared::fifo::FifoBenchmarkData;
 use crate::executor::shared::fifo::RunnerFifo;
 use crate::executor::valgrind::helpers::ignored_objects_path::get_objects_path_to_ignore;
-use crate::executor::valgrind::helpers::perf_maps::harvest_perf_maps_for_pids;
 use crate::executor::wall_time::perf::debug_info::ProcessDebugInfo;
 use crate::executor::wall_time::perf::jit_dump::harvest_perf_jit_for_pids;
 use crate::executor::wall_time::perf::perf_executable::get_working_perf_executable;