From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760909AbbA3KWu (ORCPT ); Fri, 30 Jan 2015 05:22:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58729 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758590AbbA3KWq (ORCPT ); Fri, 30 Jan 2015 05:22:46 -0500 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 1/3] perf tools: Update symtab_type with _KMODULE_COMP Date: Fri, 30 Jan 2015 11:22:24 +0100 Message-Id: <1422613346-22077-2-git-send-email-jolsa@kernel.org> In-Reply-To: <1422613346-22077-1-git-send-email-jolsa@kernel.org> References: <1422613346-22077-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are missing update of dso->symtab_type when we actualize modules paths in map_groups__set_modules_path_dir. Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 1bca3a9f2b16..e750f829e84e 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -869,14 +869,17 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg, dso_name[PATH_MAX]; struct map *map; char *long_name; + bool compressed = false; if (dot == NULL) continue; /* On some system, modules are compressed like .ko.gz */ if (is_supported_compression(dot + 1) && - is_kmodule_extension(dot - 2)) + is_kmodule_extension(dot - 2)) { dot -= 3; + compressed = true; + } snprintf(dso_name, sizeof(dso_name), "[%.*s]", (int)(dot - dent->d_name), dent->d_name); @@ -894,6 +897,10 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg, } dso__set_long_name(map->dso, long_name, true); dso__kernel_module_get_build_id(map->dso, ""); + + /* _KMODULE_COMP should be next to _KMODULE */ + if (compressed) + map->dso->symtab_type++; } } -- 1.9.3