--wip-- [skip ci]

Author: GuillaumeLagrange

crates/runner-shared/src/debug_info.rs

@@ -23,7 +23,7 @@ impl std::fmt::Debug for DebugInfo {
 
 /// Per-pid mounting info referencing a deduplicated debug info entry.
 #[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct DebugInfoPidMapping {
+pub struct MappedProcessDebugInfo {
     pub debug_info_key: String,
     pub load_bias: u64,
 }

crates/runner-shared/src/metadata.rs

@@ -6,7 +6,7 @@ use std::io::BufWriter;
 use std::path::Path;
 use std::path::PathBuf;
 
-use crate::debug_info::{DebugInfoPidMapping, ModuleDebugInfo};
+use crate::debug_info::{MappedProcessDebugInfo, ModuleDebugInfo};
 use crate::fifo::MarkerType;
 use crate::perf_map::MappedProcessModuleSymbols;
 use crate::unwind_data::MappedProcessUnwindData;
@@ -32,7 +32,7 @@ pub struct PerfMetadata {
 
     /// Kept for backward compatibility, was used before deduplication of debug info entries.
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    #[deprecated(note = "Use 'debug_info' + 'debug_info_pid_mappings_by_pid' instead")]
+    #[deprecated(note = "Use 'debug_info' + 'mapped_process_debug_info_by_pid' instead")]
     pub debug_info_by_pid: HashMap<pid_t, Vec<ModuleDebugInfo>>,
 
     /// Deduplicated debug info entries, keyed by semantic key
@@ -41,7 +41,7 @@ pub struct PerfMetadata {
 
     /// Per-pid debug info references, mapping PID to list of debug info index + load bias
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub debug_info_pid_mappings_by_pid: HashMap<pid_t, Vec<DebugInfoPidMapping>>,
+    pub mapped_process_debug_info_by_pid: HashMap<pid_t, Vec<MappedProcessDebugInfo>>,
 
     /// Per-pid unwind data references, mapping PID to list of unwind data index + mounting info
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]

src/bin/compare_walltime_output.rs

@@ -475,10 +475,10 @@ fn load_old_debug_info(dir: &Path) -> Result<BTreeMap<i32, Vec<NormalizedDebugIn
         .collect())
 }
 
-/// Load debug info from new format: `debug_info` HashMap + `debug_info_pid_mappings_by_pid`.
+/// Load debug info from new format: `debug_info` HashMap + `mapped_process_debug_info_by_pid`.
 fn load_new_debug_info(metadata: &PerfMetadata) -> BTreeMap<i32, Vec<NormalizedDebugInfoEntry>> {
     metadata
-        .debug_info_pid_mappings_by_pid
+        .mapped_process_debug_info_by_pid
         .iter()
         .map(|(pid, mappings)| {
             let mut entries: Vec<_> = mappings
@@ -840,9 +840,9 @@ fn main() -> Result<()> {
 
     println!("Loading new debug info from: {}", new_dir.display());
     println!(
-        "  (metadata has {} debug_info entries, {} pids in debug_info_pid_mappings_by_pid)",
+        "  (metadata has {} debug_info entries, {} pids in mapped_process_debug_info_by_pid)",
         metadata.debug_info.len(),
-        metadata.debug_info_pid_mappings_by_pid.len()
+        metadata.mapped_process_debug_info_by_pid.len()
     );
     let new_debug_by_pid = load_new_debug_info(&metadata);
     println!(

src/executor/wall_time/perf/mod.rs

@@ -324,7 +324,7 @@ impl BenchmarkData {
             ignored_modules: artifacts.ignored_modules,
             markers: self.marker_result.markers.clone(),
             debug_info: artifacts.debug_info,
-            debug_info_pid_mappings_by_pid: artifacts.debug_info_pid_mappings_by_pid,
+            mapped_process_debug_info_by_pid: artifacts.mapped_process_debug_info_by_pid,
             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,

src/executor/wall_time/perf/save_artifacts.rs

@@ -5,7 +5,7 @@ use crate::executor::wall_time::perf::parse_perf_file::MountedModule;
 use crate::prelude::*;
 use libc::pid_t;
 use rayon::prelude::*;
-use runner_shared::debug_info::{DebugInfoPidMapping, ModuleDebugInfo};
+use runner_shared::debug_info::{MappedProcessDebugInfo, ModuleDebugInfo};
 use runner_shared::perf_map::MappedProcessModuleSymbols;
 use runner_shared::unwind_data::{MappedProcessUnwindData, ProcessUnwindData, UnwindData};
 use std::collections::HashMap;
@@ -14,7 +14,7 @@ use std::path::{Path, PathBuf};
 pub struct SavedArtifacts {
     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 mapped_process_debug_info_by_pid: HashMap<pid_t, Vec<MappedProcessDebugInfo>>,
     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>,
@@ -33,7 +33,7 @@ pub fn save_artifacts(
     let symbol_pid_mappings_by_pid =
         save_symbols(profile_folder, mounted_modules_by_path, &path_to_key);
 
-    let (debug_info, debug_info_pid_mappings_by_pid) =
+    let (debug_info, mapped_process_debug_info_by_pid) =
         save_debug_info(mounted_modules_by_path, &mut path_to_key);
 
     let mapped_process_unwind_data_by_pid = save_unwind_data(
@@ -53,7 +53,7 @@ pub fn save_artifacts(
     SavedArtifacts {
         symbol_pid_mappings_by_pid,
         debug_info,
-        debug_info_pid_mappings_by_pid,
+        mapped_process_debug_info_by_pid,
         mapped_process_unwind_data_by_pid,
         ignored_modules,
         key_to_path,
@@ -130,7 +130,7 @@ fn save_debug_info(
     path_to_key: &mut HashMap<PathBuf, String>,
 ) -> (
     HashMap<String, ModuleDebugInfo>,
-    HashMap<pid_t, Vec<DebugInfoPidMapping>>,
+    HashMap<pid_t, Vec<MappedProcessDebugInfo>>,
 ) {
     debug!("Saving debug_info");
 
@@ -148,7 +148,7 @@ fn save_debug_info(
         })
         .collect();
 
-    let mut mappings_by_pid: HashMap<pid_t, Vec<DebugInfoPidMapping>> = HashMap::new();
+    let mut mappings_by_pid: HashMap<pid_t, Vec<MappedProcessDebugInfo>> = HashMap::new();
     for (path, m) in mounted_modules_by_path {
         if m.module_symbols.is_none() {
             continue;
@@ -161,7 +161,7 @@ fn save_debug_info(
                 mappings_by_pid
                     .entry(pid)
                     .or_default()
-                    .push(DebugInfoPidMapping {
+                    .push(MappedProcessDebugInfo {
                         debug_info_key: key.clone(),
                         load_bias,
                     });