129 lines
3.9 KiB
Diff
129 lines
3.9 KiB
Diff
From dfcb16856514453111e1b59da3d6cefa5000f18f Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 19 Jul 2020 20:13:10 +0200
|
|
Subject: [PATCH 115/201] perf metric: Collect referenced metrics in struct
|
|
metric_expr
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit e7e1badd80282ff7ee07a5176f0620f57c798934
|
|
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=e7e1badd80282ff7ee07a5176f0620f57c798934
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add referenced metrics into struct metric_expr object, so they are
|
|
accessible when computing the metric.
|
|
|
|
Storing just name and expression itself, so the metric can be resolved
|
|
and computed.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200719181320.785305-10-jolsa@kernel.org
|
|
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.h
|
|
---
|
|
tools/perf/util/metricgroup.c | 32 ++++++++++++++++++++++++++++++++
|
|
tools/perf/util/metricgroup.h | 6 ++++++
|
|
2 files changed, 38 insertions(+)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 9bb402fc03ab..ef3f1d41f7db 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -89,6 +89,7 @@ static void metric_event_delete(struct rblist *rblist __maybe_unused,
|
|
struct metric_expr *expr, *tmp;
|
|
|
|
list_for_each_entry_safe(expr, tmp, &me->head, nd) {
|
|
+ free(expr->metric_refs);
|
|
free(expr);
|
|
}
|
|
|
|
@@ -254,6 +255,7 @@ static int metricgroup__setup_events(struct list_head *groups,
|
|
|
|
list_for_each_entry (eg, groups, nd) {
|
|
struct perf_evsel **metric_events;
|
|
+ struct metric_ref *metric_refs = NULL;
|
|
|
|
metric_events = calloc(sizeof(void *),
|
|
hashmap__size(&eg->pctx.ids) + 1);
|
|
@@ -285,6 +287,36 @@ static int metricgroup__setup_events(struct list_head *groups,
|
|
free(metric_events);
|
|
break;
|
|
}
|
|
+
|
|
+ /*
|
|
+ * Collect and store collected nested expressions
|
|
+ * for metric processing.
|
|
+ */
|
|
+ if (eg->metric_refs_cnt) {
|
|
+ struct metric_ref_node *ref;
|
|
+
|
|
+ metric_refs = zalloc(sizeof(struct metric_ref) * (eg->metric_refs_cnt + 1));
|
|
+ if (!metric_refs) {
|
|
+ ret = -ENOMEM;
|
|
+ free(metric_events);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ i = 0;
|
|
+ list_for_each_entry(ref, &eg->metric_refs, list) {
|
|
+ /*
|
|
+ * Intentionally passing just const char pointers,
|
|
+ * originally from 'struct pmu_event' object.
|
|
+ * We don't need to change them, so there's no
|
|
+ * need to create our own copy.
|
|
+ */
|
|
+ metric_refs[i].metric_name = ref->metric_name;
|
|
+ metric_refs[i].metric_expr = ref->metric_expr;
|
|
+ i++;
|
|
+ }
|
|
+ };
|
|
+
|
|
+ expr->metric_refs = metric_refs;
|
|
expr->metric_expr = eg->metric_expr;
|
|
expr->metric_name = eg->metric_name;
|
|
expr->metric_unit = eg->metric_unit;
|
|
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
|
|
index c198e2c4a294..23b4f44b3f39 100644
|
|
--- a/tools/perf/util/metricgroup.h
|
|
+++ b/tools/perf/util/metricgroup.h
|
|
@@ -18,12 +18,18 @@ struct metric_event {
|
|
struct list_head head; /* list of metric_expr */
|
|
};
|
|
|
|
+struct metric_ref {
|
|
+ const char *metric_name;
|
|
+ const char *metric_expr;
|
|
+};
|
|
+
|
|
struct metric_expr {
|
|
struct list_head nd;
|
|
const char *metric_expr;
|
|
const char *metric_name;
|
|
const char *metric_unit;
|
|
struct perf_evsel **metric_events;
|
|
+ struct metric_ref *metric_refs;
|
|
int runtime;
|
|
};
|
|
|
|
--
|
|
2.27.0
|
|
|