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

Update the blazesym submodule to version 0.2.0-alpha.11. Signed-off-by: Daniel Müller <deso@posteo.net>
libbpf · Feb 23, 2024 · 2767a13 · 2767a13
1 parent 18962e5
commit 2767a13
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/blazesym b/blazesym
diff --git a/examples/c/Makefile b/examples/c/Makefile
@@ -7,8 +7,8 @@ LIBBPF_OBJ := $(abspath $(OUTPUT)/libbpf.a)
 BPFTOOL_OUTPUT ?= $(abspath $(OUTPUT)/bpftool)
 BPFTOOL ?= $(BPFTOOL_OUTPUT)/bootstrap/bpftool
 LIBBLAZESYM_SRC := $(abspath ../../blazesym/)
-LIBBLAZESYM_INC := $(abspath $(LIBBLAZESYM_SRC)/include)
-LIBBLAZESYM_OBJ := $(abspath $(OUTPUT)/libblazesym.a)
+LIBBLAZESYM_INC := $(abspath $(LIBBLAZESYM_SRC)/capi/include)
+LIBBLAZESYM_OBJ := $(abspath $(OUTPUT)/libblazesym_c.a)
 ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
 			 | sed 's/arm.*/arm/' \
 			 | sed 's/aarch64/arm64/' \
@@ -94,12 +94,12 @@ $(BPFTOOL): | $(BPFTOOL_OUTPUT)
 	$(Q)$(MAKE) ARCH= CROSS_COMPILE= OUTPUT=$(BPFTOOL_OUTPUT)/ -C $(BPFTOOL_SRC) bootstrap
 
 
-$(LIBBLAZESYM_SRC)/target/release/libblazesym.a::
-	$(Q)cd $(LIBBLAZESYM_SRC) && $(CARGO) build --release
+$(LIBBLAZESYM_SRC)/target/release/libblazesym_c.a::
+	$(Q)cd $(LIBBLAZESYM_SRC) && $(CARGO) build --package=blazesym-c --release
 
-$(LIBBLAZESYM_OBJ): $(LIBBLAZESYM_SRC)/target/release/libblazesym.a | $(OUTPUT)
+$(LIBBLAZESYM_OBJ): $(LIBBLAZESYM_SRC)/target/release/libblazesym_c.a | $(OUTPUT)
 	$(call msg,LIB, $@)
-	$(Q)cp $(LIBBLAZESYM_SRC)/target/release/libblazesym.a $@
+	$(Q)cp $(LIBBLAZESYM_SRC)/target/release/libblazesym_c.a $@
 
 # Build BPF code
 $(OUTPUT)/%.bpf.o: %.bpf.c $(LIBBPF_OBJ) $(wildcard %.h) $(VMLINUX) | $(OUTPUT) $(BPFTOOL)

diff --git a/examples/c/profile.c b/examples/c/profile.c
@@ -69,12 +69,15 @@ static void show_stack_trace(__u64 *stack, int stack_sz, pid_t pid)
 
 	if (pid) {
 		struct blaze_symbolize_src_process src = {
+      .type_size = sizeof(src),
 			.pid = pid,
 		};
-		result = blaze_symbolize_process_virt_addrs(symbolizer, &src, (const uintptr_t *)stack, stack_sz);
+		result = blaze_symbolize_process_abs_addrs(symbolizer, &src, (const uintptr_t *)stack, stack_sz);
 	} else {
-		struct blaze_symbolize_src_kernel src = {};
-		result = blaze_symbolize_kernel_virt_addrs(symbolizer, &src, (const uintptr_t *)stack, stack_sz);
+		struct blaze_symbolize_src_kernel src = {
+      .type_size = sizeof(src),
+    };
+		result = blaze_symbolize_kernel_abs_addrs(symbolizer, &src, (const uintptr_t *)stack, stack_sz);
 	}
 
 

diff --git a/examples/rust/Cargo.lock b/examples/rust/Cargo.lock
diff --git a/examples/rust/profile/src/main.rs b/examples/rust/profile/src/main.rs
@@ -119,7 +119,7 @@ fn print_frame(
 // Pid 0 means a kernel space stack.
 fn show_stack_trace(stack: &[u64], symbolizer: &symbolize::Symbolizer, pid: u32) {
     let converted_stack;
-    // The kernel always reports `u64` addresses, whereas blazesym uses `usize`.
+    // The kernel always reports `u64` addresses, whereas blazesym uses `Addr`.
     // Convert the stack trace as necessary.
     let stack = if mem::size_of::<blazesym::Addr>() != mem::size_of::<u64>() {
         converted_stack = stack
@@ -163,7 +163,7 @@ fn show_stack_trace(stack: &[u64], symbolizer: &symbolize::Symbolizer, pid: u32)
                     print_frame(&frame.name, None, &frame.code_info);
                 }
             }
-            symbolize::Symbolized::Unknown => {
+            symbolize::Symbolized::Unknown(..) => {
                 println!("{input_addr:#0width$x}: <no-symbol>", width = ADDR_WIDTH)
             }
         }