203 lines
4.9 KiB
Diff
203 lines
4.9 KiB
Diff
From f1f6bf891ff3fde37a66b88f3e76da73e0bf9152 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Fri, 4 Dec 2020 19:10:13 +0800
|
|
Subject: [PATCH 161/201] perf metricgroup: Split up metricgroup__print()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit f6fe1e48ae185d028dfcabecb7d79036e2d89d27
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f6fe1e48ae185d028dfcabecb7d79036e2d89d27
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
To aid supporting system event metric groups, break up the function
|
|
metricgroup__print() into a part which iterates metrics and a part which
|
|
actually "prints" the metric.
|
|
|
|
No functional change intended.
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Acked-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Kim Phillips <kim.phillips@amd.com>
|
|
Cc: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
|
|
Cc: Will Deacon <will@kernel.org>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: linuxarm@huawei.com
|
|
Link: http://lore.kernel.org/lkml/1607080216-36968-8-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/metricgroup.c
|
|
---
|
|
tools/perf/util/metricgroup.c | 126 +++++++++++++++++++---------------
|
|
1 file changed, 71 insertions(+), 55 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index df85d04ee869..3ebd9190a87b 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -498,6 +498,73 @@ static void metricgroup__print_strlist(struct strlist *metrics, bool raw)
|
|
putchar('\n');
|
|
}
|
|
|
|
+static int metricgroup__print_pmu_event(struct pmu_event *pe,
|
|
+ bool metricgroups, char *filter,
|
|
+ bool raw, bool details,
|
|
+ struct rblist *groups,
|
|
+ struct strlist *metriclist)
|
|
+{
|
|
+ const char *g;
|
|
+ char *omg, *mg;
|
|
+
|
|
+ g = pe->metric_group;
|
|
+ if (!g && pe->metric_name) {
|
|
+ if (pe->name)
|
|
+ return 0;
|
|
+ g = "No_group";
|
|
+ }
|
|
+
|
|
+ if (!g)
|
|
+ return 0;
|
|
+
|
|
+ mg = strdup(g);
|
|
+
|
|
+ if (!mg)
|
|
+ return -ENOMEM;
|
|
+ omg = mg;
|
|
+ while ((g = strsep(&mg, ";")) != NULL) {
|
|
+ struct mep *me;
|
|
+ char *s;
|
|
+
|
|
+ if (*g == 0)
|
|
+ g = "No_group";
|
|
+ while (isspace(*g))
|
|
+ g++;
|
|
+ if (filter && !strstr(g, filter))
|
|
+ continue;
|
|
+ if (raw)
|
|
+ s = (char *)pe->metric_name;
|
|
+ else {
|
|
+ if (asprintf(&s, "%s\n%*s%s]",
|
|
+ pe->metric_name, 8, "[", pe->desc) < 0)
|
|
+ return -1;
|
|
+ if (details) {
|
|
+ if (asprintf(&s, "%s\n%*s%s]",
|
|
+ s, 8, "[", pe->metric_expr) < 0)
|
|
+ return -1;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (!s)
|
|
+ continue;
|
|
+
|
|
+ if (!metricgroups) {
|
|
+ strlist__add(metriclist, s);
|
|
+ } else {
|
|
+ me = mep_lookup(groups, g);
|
|
+ if (!me)
|
|
+ continue;
|
|
+ strlist__add(me->metrics, s);
|
|
+ }
|
|
+
|
|
+ if (!raw)
|
|
+ free(s);
|
|
+ }
|
|
+ free(omg);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
bool raw, bool details)
|
|
{
|
|
@@ -522,67 +589,16 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
groups.node_cmp = mep_cmp;
|
|
groups.node_delete = mep_delete;
|
|
for (i = 0; ; i++) {
|
|
- const char *g;
|
|
pe = &map->table[i];
|
|
|
|
if (!pe->name && !pe->metric_group && !pe->metric_name)
|
|
break;
|
|
if (!pe->metric_expr)
|
|
continue;
|
|
- g = pe->metric_group;
|
|
- if (!g && pe->metric_name) {
|
|
- if (pe->name)
|
|
- continue;
|
|
- g = "No_group";
|
|
- }
|
|
- if (g) {
|
|
- char *omg;
|
|
- char *mg = strdup(g);
|
|
-
|
|
- if (!mg)
|
|
- return;
|
|
- omg = mg;
|
|
- while ((g = strsep(&mg, ";")) != NULL) {
|
|
- struct mep *me;
|
|
- char *s;
|
|
-
|
|
- if (*g == 0)
|
|
- g = "No_group";
|
|
- while (isspace(*g))
|
|
- g++;
|
|
- if (filter && !strstr(g, filter))
|
|
- continue;
|
|
- if (raw)
|
|
- s = (char *)pe->metric_name;
|
|
- else {
|
|
- if (asprintf(&s, "%s\n%*s%s]",
|
|
- pe->metric_name, 8, "[", pe->desc) < 0)
|
|
- return;
|
|
-
|
|
- if (details) {
|
|
- if (asprintf(&s, "%s\n%*s%s]",
|
|
- s, 8, "[", pe->metric_expr) < 0)
|
|
- return;
|
|
- }
|
|
- }
|
|
-
|
|
- if (!s)
|
|
- continue;
|
|
-
|
|
- if (!metricgroups) {
|
|
- strlist__add(metriclist, s);
|
|
- } else {
|
|
- me = mep_lookup(&groups, g);
|
|
- if (!me)
|
|
- continue;
|
|
- strlist__add(me->metrics, s);
|
|
- }
|
|
-
|
|
- if (!raw)
|
|
- free(s);
|
|
- }
|
|
- free(omg);
|
|
- }
|
|
+ if (metricgroup__print_pmu_event(pe, metricgroups, filter,
|
|
+ raw, details, &groups,
|
|
+ metriclist) < 0)
|
|
+ return;
|
|
}
|
|
|
|
if (!filter || !rblist__empty(&groups)) {
|
|
--
|
|
2.27.0
|
|
|