Skip to content

feat(walltime): search NixOS debug info path #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
not-matthias wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

feat(walltime): search NixOS debug info path #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/executor/wall_time/profiler/perf/elf_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ pub fn compute_base_avma(base_svma: u64, load_bias: u64) -> u64 {
base_svma.wrapping_add(load_bias)
}

const DEFAULT_DEBUG_DIR: &str = "/usr/lib/debug";

/// Search for a separate debug info file.
///
/// Tries two mechanisms in order:
Expand All @@ -205,11 +203,16 @@ const DEFAULT_DEBUG_DIR: &str = "/usr/lib/debug";
/// filename and relies on a CRC32 check. On Debian/Ubuntu, `*-dbg` and
/// `*-dbgsym` packages install their files under `/usr/lib/debug/.build-id/`,
/// so this path is what actually resolves stripped system libraries in
/// practice.
/// practice. On NixOS, `environment.enableDebugInfo = true` populates the
/// same layout under `/run/current-system/sw/lib/debug`.
///
/// [Separate Debug Files]: https://sourceware.org/gdb/current/onlinedocs/gdb.html/Separate-Debug-Files.html
pub fn find_debug_file(object: &object::File, binary_path: &Path) -> Option<PathBuf> {
find_debug_file_in(object, binary_path, Path::new(DEFAULT_DEBUG_DIR))
["/usr/lib/debug", "/run/current-system/sw/lib/debug"]
.iter()
.map(Path::new)
.filter(|dir| dir.exists())
.find_map(|dir| find_debug_file_in(object, binary_path, dir))
}

fn find_debug_file_in(
Expand Down