From: John Garry <john.garry@huawei.com> To: <acme@kernel.org>, <will@kernel.org>, <mark.rutland@arm.com>, <jolsa@redhat.com>, <irogers@google.com>, <leo.yan@linaro.org>, <peterz@infradead.org>, <mingo@redhat.com>, <alexander.shishkin@linux.intel.com>, <namhyung@kernel.org>, <mathieu.poirier@linaro.org> Cc: <linuxarm@huawei.com>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <qiangqing.zhang@nxp.com>, <zhangshaokun@hisilicon.com>, <james.clark@arm.com>, <linux-imx@nxp.com>, John Garry <john.garry@huawei.com> Subject: [PATCH RFC v4 01/13] perf jevents: Add support for an extra directory level Date: Thu, 8 Oct 2020 18:15:09 +0800 [thread overview] Message-ID: <1602152121-240367-2-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1602152121-240367-1-git-send-email-john.garry@huawei.com> Currently only upto a level 2 directory is supported, in form vendor/platform. Add support for a further level, to support vendor/platform sub-directories in future. Signed-off-by: John Garry <john.garry@huawei.com> --- tools/perf/pmu-events/jevents.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index fc9c158bfa13..6ab96c8dbc27 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -981,15 +981,20 @@ static int process_one_file(const char *fpath, const struct stat *sb, int level = ftwbuf->level; int err = 0; - if (level == 2 && is_dir) { + if (level >= 2 && is_dir) { + int count = 0; /* * For level 2 directory, bname will include parent name, * like vendor/platform. So search back from platform dir * to find this. + * Something similar for level 3 directory, but we're a PMU + * category folder, like vendor/platform/cpu. */ bname = (char *) fpath + ftwbuf->base - 2; for (;;) { if (*bname == '/') + count++; + if (count == level - 1) break; bname--; } @@ -1002,13 +1007,13 @@ static int process_one_file(const char *fpath, const struct stat *sb, level, sb->st_size, bname, fpath); /* base dir or too deep */ - if (level == 0 || level > 3) + if (level == 0 || level > 4) return 0; /* model directory, reset topic */ if ((level == 1 && is_dir && is_leaf_dir(fpath)) || - (level == 2 && is_dir)) { + (level >= 2 && is_dir && is_leaf_dir(fpath))) { if (close_table) print_events_table_suffix(eventsfp); -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: John Garry <john.garry@huawei.com> To: <acme@kernel.org>, <will@kernel.org>, <mark.rutland@arm.com>, <jolsa@redhat.com>, <irogers@google.com>, <leo.yan@linaro.org>, <peterz@infradead.org>, <mingo@redhat.com>, <alexander.shishkin@linux.intel.com>, <namhyung@kernel.org>, <mathieu.poirier@linaro.org> Cc: linux-kernel@vger.kernel.org, John Garry <john.garry@huawei.com>, qiangqing.zhang@nxp.com, linuxarm@huawei.com, zhangshaokun@hisilicon.com, james.clark@arm.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com Subject: [PATCH RFC v4 01/13] perf jevents: Add support for an extra directory level Date: Thu, 8 Oct 2020 18:15:09 +0800 [thread overview] Message-ID: <1602152121-240367-2-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1602152121-240367-1-git-send-email-john.garry@huawei.com> Currently only upto a level 2 directory is supported, in form vendor/platform. Add support for a further level, to support vendor/platform sub-directories in future. Signed-off-by: John Garry <john.garry@huawei.com> --- tools/perf/pmu-events/jevents.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index fc9c158bfa13..6ab96c8dbc27 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -981,15 +981,20 @@ static int process_one_file(const char *fpath, const struct stat *sb, int level = ftwbuf->level; int err = 0; - if (level == 2 && is_dir) { + if (level >= 2 && is_dir) { + int count = 0; /* * For level 2 directory, bname will include parent name, * like vendor/platform. So search back from platform dir * to find this. + * Something similar for level 3 directory, but we're a PMU + * category folder, like vendor/platform/cpu. */ bname = (char *) fpath + ftwbuf->base - 2; for (;;) { if (*bname == '/') + count++; + if (count == level - 1) break; bname--; } @@ -1002,13 +1007,13 @@ static int process_one_file(const char *fpath, const struct stat *sb, level, sb->st_size, bname, fpath); /* base dir or too deep */ - if (level == 0 || level > 3) + if (level == 0 || level > 4) return 0; /* model directory, reset topic */ if ((level == 1 && is_dir && is_leaf_dir(fpath)) || - (level == 2 && is_dir)) { + (level >= 2 && is_dir && is_leaf_dir(fpath))) { if (close_table) print_events_table_suffix(eventsfp); -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-10-08 10:19 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-08 10:15 [PATCH RFC v4 00/13] perf pmu-events: Support event aliasing for system PMUs John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` John Garry [this message] 2020-10-08 10:15 ` [PATCH RFC v4 01/13] perf jevents: Add support for an extra directory level John Garry 2020-10-08 10:15 ` [PATCH RFC v4 02/13] perf jevents: Add support for system events tables John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 03/13] perf pmu: Add pmu_id() John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 04/13] perf pmu: Add pmu_add_sys_aliases() John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 05/13] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 06/13] perf vendor events arm64: Add hip09 SMMUv3 PMCG events John Garry 2020-10-08 10:15 ` John Garry 2020-10-14 18:06 ` Robin Murphy 2020-10-14 18:06 ` Robin Murphy 2020-10-15 7:47 ` John Garry 2020-10-15 7:47 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 07/13] perf vendor events arm64: Add hip09 uncore events John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 08/13] perf metricgroup: Fix uncore metric expressions John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 09/13] perf metricgroup: Hack a fix for aliases when covering multiple PMUs John Garry 2020-10-08 10:15 ` John Garry 2020-10-18 8:50 ` [perf metricgroup] fcc9c5243c: perf-sanity-tests.Parse_and_process_metrics.fail kernel test robot 2020-10-18 23:30 ` Ian Rogers 2020-10-18 23:30 ` Ian Rogers 2020-10-19 1:52 ` Andi Kleen 2020-10-19 1:52 ` Andi Kleen 2020-10-19 8:02 ` Jin, Yao 2020-10-19 8:02 ` Jin, Yao 2020-10-19 9:48 ` John Garry 2020-10-19 9:48 ` John Garry 2020-10-19 11:49 ` Jin, Yao 2020-10-19 11:49 ` Jin, Yao 2020-10-19 16:20 ` Ian Rogers 2020-10-19 16:20 ` Ian Rogers 2020-10-19 17:04 ` John Garry 2020-10-19 17:04 ` John Garry 2020-10-20 8:56 ` kajoljain 2020-10-20 8:56 ` kajoljain 2020-10-20 16:53 ` Ian Rogers 2020-10-20 16:53 ` Ian Rogers 2020-11-03 14:43 ` John Garry 2020-11-03 14:43 ` John Garry 2020-11-03 16:05 ` Ian Rogers 2020-11-03 16:05 ` Ian Rogers 2020-11-03 16:54 ` John Garry 2020-11-03 16:54 ` John Garry 2020-11-04 4:58 ` kajoljain 2020-11-04 4:58 ` kajoljain 2020-10-08 10:15 ` [PATCH RFC v4 10/13] perf metricgroup: Split up metricgroup__print() John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 11/13] perf metricgroup: Support printing metric groups for system PMUs John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 12/13] perf metricgroup: Support adding metrics " John Garry 2020-10-08 10:15 ` John Garry 2020-10-08 10:15 ` [PATCH RFC v4 13/13] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry 2020-10-08 10:15 ` John Garry 2020-10-12 10:03 ` Joakim Zhang 2020-10-12 10:03 ` Joakim Zhang 2020-10-12 10:34 ` John Garry 2020-10-12 10:34 ` John Garry 2020-10-08 11:27 ` [PATCH RFC v4 00/13] perf pmu-events: Support event aliasing for system PMUs kajoljain 2020-10-08 11:27 ` kajoljain 2020-10-08 11:49 ` John Garry 2020-10-08 11:49 ` John Garry 2020-10-14 11:16 ` Jiri Olsa 2020-10-14 11:16 ` Jiri Olsa 2020-10-14 17:41 ` John Garry 2020-10-14 17:41 ` 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=1602152121-240367-2-git-send-email-john.garry@huawei.com \ --to=john.garry@huawei.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=irogers@google.com \ --cc=james.clark@arm.com \ --cc=jolsa@redhat.com \ --cc=leo.yan@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=mark.rutland@arm.com \ --cc=mathieu.poirier@linaro.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=qiangqing.zhang@nxp.com \ --cc=will@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.