From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932585AbbCXQ1J (ORCPT ); Tue, 24 Mar 2015 12:27:09 -0400 Received: from mail.kernel.org ([198.145.29.136]:59245 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754317AbbCXQUD (ORCPT ); Tue, 24 Mar 2015 12:20:03 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Adrian Hunter , Corey Ashford , David Ahern , Frederic Weisbecker , Paul Mackerras , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo Subject: [PATCH 03/25] perf tools: Use kmod_path__parse in is_kernel_module Date: Tue, 24 Mar 2015 13:19:18 -0300 Message-Id: <1427213980-9015-4-git-send-email-acme@kernel.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1427213980-9015-1-git-send-email-acme@kernel.org> References: <1427213980-9015-1-git-send-email-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa 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 7a7c54b42b41..f37548322c9d 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) -- 1.9.3