From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064AbeCTGXL (ORCPT ); Tue, 20 Mar 2018 02:23:11 -0400 Received: from terminus.zytor.com ([198.137.202.136]:47809 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbeCTGXF (ORCPT ); Tue, 20 Mar 2018 02:23:05 -0400 Date: Mon, 19 Mar 2018 23:21:23 -0700 From: tip-bot for John Garry Message-ID: Cc: john.garry@huawei.com, ak@linux.intel.com, mingo@kernel.org, jolsa@kernel.org, wcohen@redhat.com, linux-kernel@vger.kernel.org, will.deacon@arm.com, namhyung@kernel.org, acme@redhat.com, alexander.shishkin@linux.intel.com, zhangshaokun@hisilicon.com, peterz@infradead.org, ganapatrao.kulkarni@cavium.com, hpa@zytor.com, tglx@linutronix.de Reply-To: wcohen@redhat.com, jolsa@kernel.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, john.garry@huawei.com, mingo@kernel.org, ak@linux.intel.com, alexander.shishkin@linux.intel.com, acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, ganapatrao.kulkarni@cavium.com, hpa@zytor.com, zhangshaokun@hisilicon.com, peterz@infradead.org In-Reply-To: <1520506716-197429-2-git-send-email-john.garry@huawei.com> References: <1520506716-197429-2-git-send-email-john.garry@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf vendor events: Drop incomplete multiple mapfile support Git-Commit-ID: 4c0ab16052054946b7b28f8b0ceee57c10d64cc7 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: 4c0ab16052054946b7b28f8b0ceee57c10d64cc7 Gitweb: https://git.kernel.org/tip/4c0ab16052054946b7b28f8b0ceee57c10d64cc7 Author: John Garry AuthorDate: Thu, 8 Mar 2018 18:58:26 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 16 Mar 2018 13:53:55 -0300 perf vendor events: Drop incomplete multiple mapfile support Currently jevents supports multiple mapfiles, but this is only in the form where mapfile basename starts with 'mapfile.csv' At the moment, no architectures actually use multiple mapfiles, so drop the support for now. This patch also solves a nuisance where, when the mapfile is edited and the text editor may create a backup, jevents may use the backup, as shown: jevents: Many mapfiles? Using pmu-events/arch/arm64/mapfile.csv~, ignoring pmu-events/arch/arm64/mapfile.csv Signed-off-by: John Garry Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Ganapatrao Kulkarni Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Shaokun Zhang Cc: Will Deacon Cc: William Cohen Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lkml.kernel.org/r/1520506716-197429-2-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/README | 5 ++--- tools/perf/pmu-events/jevents.c | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/perf/pmu-events/README b/tools/perf/pmu-events/README index c2ee3e4417fe..2407abc1d441 100644 --- a/tools/perf/pmu-events/README +++ b/tools/perf/pmu-events/README @@ -11,9 +11,8 @@ tree tools/perf/pmu-events/arch/foo. - Regular files with '.json' extension in the name are assumed to be JSON files, each of which describes a set of PMU events. - - Regular files with basename starting with 'mapfile.csv' are assumed - to be a CSV file that maps a specific CPU to its set of PMU events. - (see below for mapfile format) + - The CSV file that maps a specific CPU to its set of PMU events is to + be named 'mapfile.csv' (see below for mapfile format). - Directories are traversed, but all other files are ignored. diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index b578aa26e375..9e0a21e74a67 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -798,16 +798,10 @@ static int process_one_file(const char *fpath, const struct stat *sb, * after processing all JSON files (so we can write out the * mapping table after all PMU events tables). * - * TODO: Allow for multiple mapfiles? Punt for now. */ if (level == 1 && is_file) { - if (!strncmp(bname, "mapfile.csv", 11)) { - if (mapfile) { - pr_info("%s: Many mapfiles? Using %s, ignoring %s\n", - prog, mapfile, fpath); - } else { - mapfile = strdup(fpath); - } + if (!strcmp(bname, "mapfile.csv")) { + mapfile = strdup(fpath); return 0; }