mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
	<alexander.shishkin@linux.intel.com>, <jolsa@redhat.com>,
	<namhyung@kernel.org>, <ak@linux.intel.com>, <wcohen@redhat.com>,
	<will.deacon@arm.com>, <ganapatrao.kulkarni@cavium.com>
Cc: <linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
	<zhangshaokun@hisilicon.com>,
	<linux-arm-kernel@lists.infradead.org>,
	"John Garry" <john.garry@huawei.com>
Subject: [PATCH 1/9] perf vendor events: drop incomplete multiple mapfile support
Date: Wed, 7 Feb 2018 01:44:56 +0800	[thread overview]
Message-ID: <1517939104-230881-2-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1517939104-230881-1-git-send-email-john.garry@huawei.com>

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 <john.garry@huawei.com>
---
 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 c2ee3e4..2407abc 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 b578aa2..9e0a21e 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;
 		}
 
-- 
1.9.1

  reply	other threads:[~2018-02-06 16:57 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-06 17:44 [PATCH 0/9] perf events patches for improved ARM64 support John Garry
2018-02-06 17:44 ` John Garry [this message]
2018-02-08 13:55   ` [PATCH 1/9] perf vendor events: drop incomplete multiple mapfile support Jiri Olsa
2018-02-06 17:44 ` [PATCH 2/9] perf utils: add support for pmu events vendor sub-directory John Garry
2018-02-08 13:55   ` Jiri Olsa
2018-02-06 17:44 ` [PATCH 3/9] perf vendor events arm64: Relocate ThunderX2 JSON John Garry
2018-02-06 17:44 ` [PATCH 4/9] perf vendor events arm64: Relocate Cortex A53 JSONs John Garry
2018-02-06 17:45 ` [PATCH 5/9] perf utils: add support for arch standard events John Garry
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 15:57     ` John Garry
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 14:02     ` Alan Cox
2018-02-08 15:31       ` John Garry
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 13:54   ` Jiri Olsa
2018-02-08 13:55   ` Jiri Olsa
2018-02-08 14:45     ` John Garry
2018-02-08 14:54       ` Jiri Olsa
2018-02-08 13:55   ` Jiri Olsa
2018-02-08 13:55   ` Jiri Olsa
2018-02-08 15:25     ` John Garry
2018-02-09  8:53       ` Jiri Olsa
2018-02-08 13:55   ` Jiri Olsa
2018-02-08 14:59     ` John Garry
2018-02-06 17:45 ` [PATCH 6/9] perf utils: add armv8-recommended.json John Garry
2018-02-06 17:45 ` [PATCH 7/9] perf utils: fixup Cavium ThunderX2 JSON to use ARMv8 recommended events John Garry
2018-02-06 17:45 ` [PATCH 8/9] perf utils: fixup ARM Cortex A53 JSONs " John Garry
2018-02-06 17:45 ` [PATCH 9/9] perf utils: add HiSilicon hip08 JSON file John Garry

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1517939104-230881-2-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=ganapatrao.kulkarni@cavium.com \
    --cc=jolsa@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=wcohen@redhat.com \
    --cc=will.deacon@arm.com \
    --cc=zhangshaokun@hisilicon.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®