From 4b207312dd81e2b78d094f089e097b4aeaa8e665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Fri, 23 Feb 2024 12:59:02 -0800 Subject: [PATCH] deps: update blazesym submodule to v0.2.0-alpha.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the blazesym submodule to version 0.2.0-alpha.11. Signed-off-by: Daniel Müller --- blazesym | 2 +- examples/c/Makefile | 12 ++++++------ examples/c/profile.c | 9 ++++++--- examples/rust/Cargo.lock | 2 +- examples/rust/profile/src/main.rs | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/blazesym b/blazesym index 3be88b4b..16bfee4b 160000 --- a/blazesym +++ b/blazesym @@ -1 +1 @@ -Subproject commit 3be88b4bf4a86109834930ab2b720dcb8a3a3de2 +Subproject commit 16bfee4bca2fe73e19f9530d334a9523d9551cbd diff --git a/examples/c/Makefile b/examples/c/Makefile index cd0a70b9..bc9e71b2 100644 --- 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 index 1c992d3f..b1912458 100644 --- 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 index 049ad031..3088d3dc 100644 --- a/examples/rust/Cargo.lock +++ b/examples/rust/Cargo.lock @@ -63,7 +63,7 @@ checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "blazesym" -version = "0.2.0-alpha.8" +version = "0.2.0-alpha.11" dependencies = [ "cpp_demangle", "gimli", diff --git a/examples/rust/profile/src/main.rs b/examples/rust/profile/src/main.rs index 1a6a03ed..5ab6a3e9 100644 --- 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::() != mem::size_of::() { 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}: ", width = ADDR_WIDTH) } }