From 914f85c4a2db34429b146a57652d2db24d063379 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Thu, 12 Feb 2015 22:27:50 +0100 Subject: [PATCH] perf tools: Use kmod_path__parse in decompress_kmodule Replacing the file name parsing with kmod_path__parse. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-zpyyitlte7lwe2ywi51rj4n5@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 62742e46c010..78ffde9df9bf 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -579,32 +579,34 @@ static int dso__swap_init(struct dso *dso, unsigned char eidata) static int decompress_kmodule(struct dso *dso, const char *name, enum dso_binary_type type) { - int fd; - const char *ext = strrchr(name, '.'); + int fd = -1; char tmpbuf[] = "/tmp/perf-kmod-XXXXXX"; + struct kmod_path m; if (type != DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE_COMP && type != DSO_BINARY_TYPE__GUEST_KMODULE_COMP && type != DSO_BINARY_TYPE__BUILD_ID_CACHE) return -1; - if (!ext || !is_supported_compression(ext + 1)) { - ext = strrchr(dso->name, '.'); - if (!ext || !is_supported_compression(ext + 1)) - return -1; - } + if (type == DSO_BINARY_TYPE__BUILD_ID_CACHE) + name = dso->long_name; + + if (kmod_path__parse_ext(&m, name) || !m.comp) + return -1; fd = mkstemp(tmpbuf); if (fd < 0) - return -1; + goto out; - if (!decompress_to_file(ext + 1, name, fd)) { + if (!decompress_to_file(m.ext, name, fd)) { close(fd); fd = -1; } unlink(tmpbuf); +out: + free(m.ext); return fd; } -- 2.11.0