From ca0cff64460270feffa18caa9051af828c4c37a7 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 8 Jun 2023 17:29:27 -0700 Subject: [PATCH] libsysprof-analyze: fix binary-nick usage --- src/libsysprof-analyze/sysprof-elf-symbolizer.c | 2 +- src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c | 4 ++-- src/libsysprof-analyze/sysprof-symbol-private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsysprof-analyze/sysprof-elf-symbolizer.c b/src/libsysprof-analyze/sysprof-elf-symbolizer.c index afc779c8..dfd69e72 100644 --- a/src/libsysprof-analyze/sysprof-elf-symbolizer.c +++ b/src/libsysprof-analyze/sysprof-elf-symbolizer.c @@ -131,8 +131,8 @@ sysprof_elf_symbolizer_symbolize (SysprofSymbolizer *symbolizer, end_address++; return _sysprof_symbol_new (sysprof_strings_get (strings, name), - sysprof_strings_get (strings, sysprof_elf_get_nick (elf)), sysprof_strings_get (strings, path), + sysprof_strings_get (strings, sysprof_elf_get_nick (elf)), map_begin + (begin_address - file_offset), map_begin + (end_address - file_offset)); diff --git a/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c b/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c index b87c42aa..0995ea97 100644 --- a/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c +++ b/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c @@ -276,8 +276,8 @@ sysprof_kallsyms_symbolizer_symbolize (SysprofSymbolizer *symbolizer, if (address >= ksym->address && (address < next->address || next->address == 0)) return _sysprof_symbol_new (g_ref_string_acquire (ksym->name), - g_ref_string_acquire (linux_string), NULL, + g_ref_string_acquire (linux_string), ksym->address, next->address ? next->address : ksym->address + LAST_SYMBOL_LEN); @@ -295,8 +295,8 @@ failure: g_snprintf (name, sizeof name, "In Kernel+0x%"G_GINT64_MODIFIER"x", address); return _sysprof_symbol_new (sysprof_strings_get (strings, name), - g_ref_string_acquire (linux_string), NULL, + g_ref_string_acquire (linux_string), address, address + 1); } diff --git a/src/libsysprof-analyze/sysprof-symbol-private.h b/src/libsysprof-analyze/sysprof-symbol-private.h index 4eab3e37..9961c691 100644 --- a/src/libsysprof-analyze/sysprof-symbol-private.h +++ b/src/libsysprof-analyze/sysprof-symbol-private.h @@ -42,8 +42,8 @@ struct _SysprofSymbol }; SysprofSymbol *_sysprof_symbol_new (GRefString *name, - GRefString *binary_nick, GRefString *binary_path, + GRefString *binary_nick, SysprofAddress begin_address, SysprofAddress end_address);