deps: update blazesym submodule to v0.2.0-alpha.5

Update the blazesym submodule to version 0.2.0-alpha.5. Also change the dependency to using the default features, which includes DWARF support and transparent symbol demangling. The profile example is overhauled to use the changed APIs and improve the code to be less redundant. Signed-off-by: Daniel Müller <[email protected]>
libbpf · Aug 10, 2023 · c174771 · c174771
1 parent d3fcabb
commit c174771
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 51 deletions.
diff --git a/blazesym b/blazesym
diff --git a/examples/rust/Cargo.lock b/examples/rust/Cargo.lock
diff --git a/examples/rust/profile/Cargo.toml b/examples/rust/profile/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-2.0 OR BSD-3-Clause"
 edition = "2021"
 
 [dependencies]
-blazesym = { path = "../../../blazesym", default-features = false, features = ["dont-generate-test-files"] }
+blazesym = { path = "../../../blazesym" }
 clap = { version = "4.0", features = ["derive"] }
 libbpf-rs = "0.19"
 libc = "*"

diff --git a/examples/rust/profile/src/main.rs b/examples/rust/profile/src/main.rs
@@ -1,9 +1,6 @@
-use std::u64;
-
-use std::boxed::Box;
 use std::io::Error;
 use std::mem;
-use std::result::Result;
+use std::path::PathBuf;
 use std::time::Duration;
 
 use blazesym::symbolize;
@@ -97,49 +94,36 @@ fn show_stack_trace(stack: &[u64], symbolizer: &symbolize::Symbolizer, pid: u32)
         },
     };
 
-    for i in 0..stack.len() {
-        if syms.len() <= i || syms[i].len() == 0 {
-            println!("  {} [<{:016x}>]", i, stack[i]);
-            continue;
-        }
-
-        if syms[i].len() == 1 {
-            let sym = &syms[i][0];
-            if !sym.path.as_os_str().is_empty() {
-                println!(
-                    "  {} [<{:016x}>] {}+0x{:x} {}:{}",
-                    i,
-                    stack[i],
-                    sym.symbol,
-                    stack[i] - sym.addr,
-                    sym.path.display(),
-                    sym.line
-                );
-            } else {
-                println!(
-                    "  {} [<{:016x}>] {}+0x{}",
-                    i,
-                    stack[i],
-                    sym.symbol,
-                    stack[i] - sym.addr
-                );
-            }
-            continue;
-        }
-
-        println!("  {} [<{:016x}>]", i, stack[i]);
-
-        for sym in &syms[i] {
-            if !sym.path.as_os_str().is_empty() {
-                println!(
-                    "        {}+0x{:x} {}:{}",
-                    sym.symbol,
-                    stack[i] - sym.addr,
-                    sym.path.display(),
-                    sym.line
-                );
-            } else {
-                println!("        {}+0x{}", sym.symbol, stack[i] - sym.addr);
+    for (i, (addr, syms)) in stack.iter().zip(syms).enumerate() {
+        let mut addr_fmt = format!(" {i:2} [<{addr:016x}>]");
+        if syms.is_empty() {
+            println!("{addr_fmt}")
+        } else {
+            for (i, sym) in syms.into_iter().enumerate() {
+                if i == 1 {
+                    addr_fmt = addr_fmt.replace(|_c| true, " ");
+                }
+
+                let symbolize::Sym {
+                    name, addr, offset, ..
+                } = sym;
+
+                let path = match (sym.dir, sym.file) {
+                    (Some(dir), Some(file)) => Some(dir.join(file)),
+                    (dir, file) => dir.or_else(|| file.map(PathBuf::from)),
+                };
+
+                let src_loc = if let (Some(path), Some(line)) = (path, sym.line) {
+                    if let Some(col) = sym.column {
+                        format!(" {}:{line}:{col}", path.display())
+                    } else {
+                        format!(" {}:{line}", path.display())
+                    }
+                } else {
+                    String::new()
+                };
+
+                println!("{addr_fmt} {name} @ {addr:#x}+{offset:#x}{src_loc}");
             }
         }
     }