chore: dont use regex in perf map harvest

Author: not-matthias

src/run/runner/valgrind/executor.rs

@@ -41,7 +41,7 @@ impl Executor for ValgrindExecutor {
         _system_info: &SystemInfo,
         run_data: &RunData,
     ) -> Result<()> {
-        harvest_perf_maps(&run_data.profile_folder)?;
+        harvest_perf_maps(&run_data.profile_folder).await?;
 
         Ok(())
     }

src/run/runner/valgrind/helpers/perf_maps.rs

@@ -1,15 +1,9 @@
 use crate::prelude::*;
-use lazy_static::lazy_static;
-use regex::Regex;
 use std::collections::HashSet;
 use std::fs;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
-lazy_static! {
-    static ref PERF_MAP_REGEX: Regex = Regex::new(r"perf-(\d+)\.map").unwrap();
-}
-
-pub fn harvest_perf_maps(profile_folder: &Path) -> Result<()> {
+pub async fn harvest_perf_maps(profile_folder: &Path) -> Result<()> {
     // Get profile files (files with .out extension)
     let profile_files = fs::read_dir(profile_folder)?
         .filter_map(|entry| entry.ok())
@@ -21,27 +15,31 @@ pub fn harvest_perf_maps(profile_folder: &Path) -> Result<()> {
         .iter()
         .filter_map(|path| path.file_stem())
         .map(|pid| pid.to_str().unwrap())
+        .filter_map(|pid| pid.parse().ok())
         .collect::<HashSet<_>>();
 
-    let perf_map_files = fs::read_dir("/tmp")?
-        .filter_map(|entry| entry.ok())
-        .map(|entry| entry.path())
-        .filter(|path| {
-            path.file_name()
-                .and_then(|name| name.to_str())
-                .and_then(|name| PERF_MAP_REGEX.captures(name))
-                .and_then(|captures| captures.get(1))
-                .map(|pid| pids.contains(pid.as_str()))
-                .unwrap_or(false)
-        });
+    harvest_perf_maps_for_pids(profile_folder, &pids).await
+}
+
+pub async fn harvest_perf_maps_for_pids(profile_folder: &Path, pids: &HashSet<i32>) -> Result<()> {
+    let perf_maps = pids
+        .iter()
+        .map(|pid| format!("perf-{}.map", pid))
+        .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 perf_map_file in perf_map_files {
-        let source_path = perf_map_file.clone();
-        let dest_path = profile_folder.join(perf_map_file.file_name().unwrap());
-        fs::copy(source_path, dest_path).map_err(|e| {
+    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 {}: {}",
-                perf_map_file.display(),
+                "Failed to copy perf map file: {:?} to {}: {}",
+                src_path.file_name(),
                 profile_folder.display(),
                 e
             )