--wip-- [skip ci]

Author: GuillaumeLagrange

crates/runner-shared/src/metadata.rs

@@ -8,7 +8,7 @@ use std::path::PathBuf;
 
 use crate::debug_info::{DebugInfoPidMapping, ModuleDebugInfo};
 use crate::fifo::MarkerType;
-use crate::perf_map::ProcessModuleLoadBias;
+use crate::perf_map::MappedProcessModuleSymbols;
 use crate::unwind_data::MappedProcessUnwindData;
 
 #[derive(Serialize, Deserialize)]
@@ -45,16 +45,16 @@ pub struct PerfMetadata {
 
     /// Per-pid unwind data references, mapping PID to list of unwind data index + mounting info
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub unwind_data_pid_mappings_by_pid: HashMap<pid_t, Vec<MappedProcessUnwindData>>,
+    pub mapped_process_unwind_data_by_pid: HashMap<pid_t, Vec<MappedProcessUnwindData>>,
 
     /// Per-pid symbol references, mapping PID to list of perf map index + load bias
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub symbol_pid_mappings_by_pid: HashMap<pid_t, Vec<ProcessModuleLoadBias>>,
+    pub mapped_process_module_symbols: HashMap<pid_t, Vec<MappedProcessModuleSymbols>>,
 
-    /// Mapping from semantic key to original binary path
+    /// Mapping from semantic `path_key` to original binary path on host disk
     /// Kept for traceability, and if we ever need to reconstruct the original paths from the keys
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub key_to_path: HashMap<String, PathBuf>,
+    pub path_key_to_path: HashMap<String, PathBuf>,
 }
 
 impl PerfMetadata {

crates/runner-shared/src/perf_map.rs

@@ -5,7 +5,7 @@ pub const SYMBOLS_MAP_SUFFIX: &str = "symbols.map";
 
 /// Per-pid mounting info referencing a deduplicated perf map entry.
 #[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ProcessModuleLoadBias {
+pub struct MappedProcessModuleSymbols {
     pub perf_map_key: String,
     pub load_bias: u64,
 }

src/bin/compare_walltime_output.rs

@@ -162,7 +162,7 @@ fn load_new_format(
     // Combine with per-pid metadata
     let mut result: BTreeMap<i32, Vec<NormalizedEntry>> = BTreeMap::new();
 
-    for (pid, mappings) in &metadata.unwind_data_pid_mappings_by_pid {
+    for (pid, mappings) in &metadata.mapped_process_unwind_data_by_pid {
         let entries = result.entry(*pid).or_default();
         for mapping in mappings {
             let v3 = unwind_by_key
@@ -313,7 +313,7 @@ fn load_new_perf_maps(
     // Combine with per-pid metadata to apply load_bias
     let mut result: BTreeMap<i32, Vec<PerfMapSymbol>> = BTreeMap::new();
 
-    for (pid, mappings) in &metadata.symbol_pid_mappings_by_pid {
+    for (pid, mappings) in &metadata.mapped_process_module_symbols {
         let entries = result.entry(*pid).or_default();
         for mapping in mappings {
             let raw_symbols = maps_by_key.get(&mapping.perf_map_key).with_context(|| {

src/executor/wall_time/perf/mod.rs

@@ -325,9 +325,9 @@ impl BenchmarkData {
             markers: self.marker_result.markers.clone(),
             debug_info: artifacts.debug_info,
             debug_info_pid_mappings_by_pid: artifacts.debug_info_pid_mappings_by_pid,
-            unwind_data_pid_mappings_by_pid: artifacts.unwind_data_pid_mappings_by_pid,
-            symbol_pid_mappings_by_pid: artifacts.symbol_pid_mappings_by_pid,
-            key_to_path: artifacts.key_to_path,
+            mapped_process_unwind_data_by_pid: artifacts.mapped_process_unwind_data_by_pid,
+            mapped_process_module_symbols: artifacts.symbol_pid_mappings_by_pid,
+            path_key_to_path: artifacts.key_to_path,
             debug_info_by_pid: Default::default(), // No longer used
         };
         metadata.save_to(&path).unwrap();

src/executor/wall_time/perf/save_artifacts.rs

@@ -6,16 +6,16 @@ use crate::prelude::*;
 use libc::pid_t;
 use rayon::prelude::*;
 use runner_shared::debug_info::{DebugInfoPidMapping, ModuleDebugInfo};
-use runner_shared::perf_map::ProcessModuleLoadBias;
+use runner_shared::perf_map::MappedProcessModuleSymbols;
 use runner_shared::unwind_data::{MappedProcessUnwindData, ProcessUnwindData, UnwindData};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 
 pub struct SavedArtifacts {
-    pub symbol_pid_mappings_by_pid: HashMap<pid_t, Vec<ProcessModuleLoadBias>>,
+    pub symbol_pid_mappings_by_pid: HashMap<pid_t, Vec<MappedProcessModuleSymbols>>,
     pub debug_info: HashMap<String, ModuleDebugInfo>,
     pub debug_info_pid_mappings_by_pid: HashMap<pid_t, Vec<DebugInfoPidMapping>>,
-    pub unwind_data_pid_mappings_by_pid: HashMap<pid_t, Vec<MappedProcessUnwindData>>,
+    pub mapped_process_unwind_data_by_pid: HashMap<pid_t, Vec<MappedProcessUnwindData>>,
     pub ignored_modules: Vec<(String, u64, u64)>,
     pub key_to_path: HashMap<String, PathBuf>,
 }
@@ -36,7 +36,7 @@ pub fn save_artifacts(
     let (debug_info, debug_info_pid_mappings_by_pid) =
         save_debug_info(mounted_modules_by_path, &mut path_to_key);
 
-    let unwind_data_pid_mappings_by_pid = save_unwind_data(
+    let mapped_process_unwind_data_by_pid = save_unwind_data(
         profile_folder,
         mounted_modules_by_path,
         jit_unwind_data_by_pid,
@@ -54,7 +54,7 @@ pub fn save_artifacts(
         symbol_pid_mappings_by_pid,
         debug_info,
         debug_info_pid_mappings_by_pid,
-        unwind_data_pid_mappings_by_pid,
+        mapped_process_unwind_data_by_pid,
         ignored_modules,
         key_to_path,
     }
@@ -86,7 +86,7 @@ fn save_symbols(
     profile_folder: &Path,
     mounted_modules_by_path: &HashMap<PathBuf, MountedModule>,
     path_to_key: &HashMap<PathBuf, String>,
-) -> HashMap<pid_t, Vec<ProcessModuleLoadBias>> {
+) -> HashMap<pid_t, Vec<MappedProcessModuleSymbols>> {
     let symbols_count = mounted_modules_by_path
         .values()
         .filter(|m| m.module_symbols.is_some())
@@ -100,7 +100,7 @@ fn save_symbols(
         }
     });
 
-    let mut mappings_by_pid: HashMap<pid_t, Vec<ProcessModuleLoadBias>> = HashMap::new();
+    let mut mappings_by_pid: HashMap<pid_t, Vec<MappedProcessModuleSymbols>> = HashMap::new();
     for (path, m) in mounted_modules_by_path {
         if m.module_symbols.is_none() {
             continue;
@@ -111,7 +111,7 @@ fn save_symbols(
                 mappings_by_pid
                     .entry(pid)
                     .or_default()
-                    .push(ProcessModuleLoadBias {
+                    .push(MappedProcessModuleSymbols {
                         perf_map_key: key.clone(),
                         load_bias,
                     });