diff options
| author |   Jiri Olsa <jolsa@kernel.org> | 2015-02-12 22:27:50 +0100 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-23 12:37:17 -0300 |
| commit | 914f85c4a2db34429b146a57652d2db24d063379 (patch) | |
| tree | 59140800e19829656b33e1eb0df53fd553180056 /tools/perf/util | |
| parent | perf tools: Use kmod_path__parse in map_groups__set_modules_path_dir (diff) | |
| download | linux-dev-914f85c4a2db34429b146a57652d2db24d063379.tar.xz linux-dev-914f85c4a2db34429b146a57652d2db24d063379.zip | |
perf tools: Use kmod_path__parse in decompress_kmodule
Replacing the file name parsing with kmod_path__parse.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zpyyitlte7lwe2ywi51rj4n5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/symbol-elf.c | 20 |
1 files 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; } |