As documented in the comment gdb looks for debug files not only relative to the binary's directory, but also in .debug and /usr/lib/debug/. Let perf do the same thing.
Signed-off-by: Uwe Kleine-König <[email protected]> --- tools/perf/util/dso.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 774f6ec884d5..51d39f37cabd 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -45,21 +45,50 @@ int dso__read_binary_type_filename(const struct dso *dso, switch (type) { case DSO_BINARY_TYPE__DEBUGLINK: { - char *debuglink; + /* gdb interprets the content of the debuglink section as + * path relative to + * - the binary's directory + * - .debug/ in the binary's directory + * - /usr/lib/debug + * and uses the first one that exists. + */ + char debuglink[512]; + char *pathbase; len = __symbol__join_symfs(filename, size, dso->long_name); - debuglink = filename + len; - while (debuglink != filename && *debuglink != '/') - debuglink--; - if (*debuglink == '/') - debuglink++; + if (!is_regular_file(filename)) { + ret = -1; + break; + } - ret = -1; - if (!is_regular_file(filename)) + ret = filename__read_debuglink(filename, + debuglink, sizeof(debuglink)); + if (ret < 0) + break; + + pathbase = filename + len; + while (pathbase != filename && *pathbase != '/') + pathbase--; + if (*pathbase == '/') + pathbase++; + + snprintf(pathbase, size - (pathbase - filename), + "%s", debuglink); + if (is_regular_file(filename)) + break; + + snprintf(pathbase, size - (pathbase - filename), + ".debug/%s", debuglink); + if (is_regular_file(filename)) + break; + + len = __symbol__join_symfs(filename, size, "/usr/lib/debug"); + snprintf(filename + len, size - len, "%s", debuglink); + + if (is_regular_file(filename)) break; - ret = filename__read_debuglink(filename, debuglink, - size - (debuglink - filename)); + ret = -1; } break; case DSO_BINARY_TYPE__BUILD_ID_CACHE: -- 2.8.1
