From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755134AbbCXQ3a (ORCPT ); Tue, 24 Mar 2015 12:29:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56708 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755114AbbCXQ31 (ORCPT ); Tue, 24 Mar 2015 12:29:27 -0400 Date: Tue, 24 Mar 2015 09:29:04 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, fweisbec@gmail.com, hpa@zytor.com, adrian.hunter@intel.com, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, eranian@google.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, paulus@samba.org, cjashfor@linux.vnet.ibm.com Reply-To: cjashfor@linux.vnet.ibm.com, jolsa@kernel.org, paulus@samba.org, linux-kernel@vger.kernel.org, eranian@google.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, mingo@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, acme@redhat.com, hpa@zytor.com, fweisbec@gmail.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Use kmod_path__parse in is_kernel_module Git-Commit-ID: 8dee9ff110f11fa536caef3cd2da23b74dceaf5b 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: 8dee9ff110f11fa536caef3cd2da23b74dceaf5b Gitweb: http://git.kernel.org/tip/8dee9ff110f11fa536caef3cd2da23b74dceaf5b Author: Jiri Olsa AuthorDate: Thu, 12 Feb 2015 15:56:21 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Mar 2015 12:38:37 -0300 perf tools: Use kmod_path__parse in is_kernel_module Replacing the current parsing code with kmod_path__parse function call. 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-r9mpbbgkp39wp1cdmv13ddq0@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 7a7c54b..f375483 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -178,19 +178,15 @@ bool is_kmodule_extension(const char *ext) bool is_kernel_module(const char *pathname, bool *compressed) { - const char *ext = strrchr(pathname, '.'); + struct kmod_path m; - if (ext == NULL) - return false; + if (kmod_path__parse(&m, pathname)) + return NULL; - if (is_supported_compression(ext + 1)) { - if (compressed) - *compressed = true; - ext -= 3; - } else if (compressed) - *compressed = false; + if (compressed) + *compressed = m.comp; - return is_kmodule_extension(ext + 1); + return m.kmod; } bool decompress_to_file(const char *ext, const char *filename, int output_fd)