varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof: try both short and long-form debubdir

Browse Source 
While fixing things for Flatpak (which have a path deduplicating some
of the path parts) works there, it breaks locating the debuglink in
other places such as GNOME OS.

This tries both forms, using the long form first and then the short
form second, since Flatpak is likely a subset of everything that needs
to be located.
This commit is contained in:
Christian Hergert
2023-08-30 10:52:27 -07:00
parent 9396def931
commit 85e085b975
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsysprof/sysprof-elf-loader.c
View File

@ -333,24 +333,32 @@ sysprof_elf_loader_annotate (SysprofElfLoader *self,
g_autoptr(SysprofElf) debug_link_elf = NULL;
g_autofree char *directory_name = NULL;
g_autofree char *debug_path = NULL;
g_autofree char *short_debug_path = NULL;
g_autofree char *container_path = NULL;
const char *short_directory_name;
const char *debug_dir = self->debug_dirs[i];
const char *build_id;
directory_name = g_path_get_dirname (orig_file);
short_directory_name = skip_common_prefix (directory_name, debug_dir);
debug_path = g_build_filename (debug_dir, short_directory_name, debug_link, NULL);
build_id = sysprof_elf_get_build_id (elf);
if (try_load_build_id (self, mount_namespace, elf, build_id, debug_dir))
return;
debug_path = g_build_filename (debug_dir, directory_name, debug_link, NULL);
if ((debug_link_elf = sysprof_elf_loader_load (self, mount_namespace, debug_path, build_id, 0, NULL)))
{
sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf));
return;
}
short_directory_name = skip_common_prefix (directory_name, debug_dir);
short_debug_path = g_build_filename (debug_dir, short_directory_name, debug_link, NULL);
if ((debug_link_elf = sysprof_elf_loader_load (self, mount_namespace, short_debug_path, build_id, 0, NULL)))
{
sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf));
return;
}
}
}