From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbbCXQ3S (ORCPT ); Tue, 24 Mar 2015 12:29:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56695 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752723AbbCXQ3O (ORCPT ); Tue, 24 Mar 2015 12:29:14 -0400 Date: Tue, 24 Mar 2015 09:28:43 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: adrian.hunter@intel.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, namhyung@kernel.org, paulus@samba.org, eranian@google.com, dsahern@gmail.com, fweisbec@gmail.com, mingo@kernel.org, jolsa@kernel.org, acme@redhat.com Reply-To: fweisbec@gmail.com, mingo@kernel.org, jolsa@kernel.org, acme@redhat.com, namhyung@kernel.org, paulus@samba.org, dsahern@gmail.com, eranian@google.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Use kmod_path__parse in decompress_kmodule Git-Commit-ID: 914f85c4a2db34429b146a57652d2db24d063379 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 914f85c4a2db34429b146a57652d2db24d063379 Gitweb: http://git.kernel.org/tip/914f85c4a2db34429b146a57652d2db24d063379 Author: Jiri Olsa AuthorDate: Thu, 12 Feb 2015 22:27:50 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Mar 2015 12:37:17 -0300 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 62742e4..78ffde9 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; }