Skip to content
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

Fix object path absolute paths #75

Merged
merged 1 commit into from
Sep 23, 2024
+7 −9
Merged

Fix object path absolute paths #75

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
16 changes: 7 additions & 9 deletions src/profiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,13 +1267,11 @@ impl Profiler<'_> {
}
match &map.pathname {
procfs::process::MMapPath::Path(path) => {
let mut abs_path = proc.exe()?;
abs_path.push("/root");
abs_path.push(path);
let abs_path = format!("/proc/{}/root/{}", pid, path.to_string_lossy());

// We've seen debug info executables that get deleted in Rust applications.
// There are probably other cases, but we'll handle them as we bump into them.
if abs_path.to_str().unwrap().contains("(deleted)") {
if abs_path.contains("(deleted)") {
continue;
}

Expand All @@ -1282,17 +1280,17 @@ impl Profiler<'_> {
let file = match fs::File::open(&abs_path) {
Ok(f) => f,
Err(e) => {
warn!("failed to open file {} due to {:?}", abs_path.display(), e);
warn!("failed to open file {} due to {:?}", abs_path, e);
// Rather than returning here, we prefer to be able to profile some
// parts of the binary
continue;
}
};

let object_file = match ObjectFile::new(&abs_path) {
let object_file = match ObjectFile::new(&PathBuf::from(abs_path.clone())) {
Ok(f) => f,
Err(e) => {
warn!("object_file {} failed with {:?}", abs_path.display(), e);
warn!("object_file {} failed with {:?}", abs_path, e);
// Rather than returning here, we prefer to be able to profile some
// parts of the binary
continue;
Expand All @@ -1311,7 +1309,7 @@ impl Profiler<'_> {
};

let Ok(executable_id) = object_file.id() else {
debug!("could not get id for object file: {:?}", abs_path);
debug!("could not get id for object file: {}", abs_path);
continue;
};

Expand Down Expand Up @@ -1343,7 +1341,7 @@ impl Profiler<'_> {
Entry::Vacant(entry) => match object_file.elf_load() {
Ok(elf_load) => {
entry.insert(ObjectFileInfo {
path: abs_path,
path: PathBuf::from(abs_path),
file,
load_offset: elf_load.offset,
load_vaddr: elf_load.vaddr,
Expand Down