90 lines
3.0 KiB
Diff
90 lines
3.0 KiB
Diff
From dcedd111e3843d6b47fb723282481c8cf1cce769 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Tue, 2 Jun 2020 23:47:36 +0200
|
|
Subject: [PATCH 099/201] perf tools: Add metricgroup__parse_groups_test
|
|
function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit f78ac00a8c999f4418e69e606485784fc5ff1d09
|
|
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=f78ac00a8c999f4418e69e606485784fc5ff1d09
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add the metricgroup__parse_groups_test function. It will be used as
|
|
test's interface to metric parsing in following changes.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200602214741.1218986-9-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/metricgroup.c | 11 +++++++++++
|
|
tools/perf/util/metricgroup.h | 9 +++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index b3feb3b5cd99..5058db5810aa 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -763,6 +763,17 @@ int metricgroup__parse_groups(const struct option *opt,
|
|
metric_no_merge, NULL, metric_events, map);
|
|
}
|
|
|
|
+int metricgroup__parse_groups_test(struct perf_evlist *evlist,
|
|
+ struct pmu_events_map *map,
|
|
+ const char *str,
|
|
+ bool metric_no_group,
|
|
+ bool metric_no_merge,
|
|
+ struct rblist *metric_events)
|
|
+{
|
|
+ return parse_groups(evlist, str, metric_no_group,
|
|
+ metric_no_merge, &perf_pmu__fake, metric_events, map);
|
|
+}
|
|
+
|
|
bool metricgroup__has_metric(const char *metric)
|
|
{
|
|
struct pmu_events_map *map = perf_pmu__find_map(NULL);
|
|
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
|
|
index b6dfd7d09b9c..11811764edde 100644
|
|
--- a/tools/perf/util/metricgroup.h
|
|
+++ b/tools/perf/util/metricgroup.h
|
|
@@ -7,8 +7,10 @@
|
|
#include <stdbool.h>
|
|
|
|
struct perf_evsel;
|
|
+struct perf_evlist;
|
|
struct option;
|
|
struct rblist;
|
|
+struct pmu_events_map;
|
|
|
|
struct metric_event {
|
|
struct rb_node nd;
|
|
@@ -34,6 +36,13 @@ int metricgroup__parse_groups(const struct option *opt,
|
|
bool metric_no_merge,
|
|
struct rblist *metric_events);
|
|
|
|
+int metricgroup__parse_groups_test(struct perf_evlist *evlist,
|
|
+ struct pmu_events_map *map,
|
|
+ const char *str,
|
|
+ bool metric_no_group,
|
|
+ bool metric_no_merge,
|
|
+ struct rblist *metric_events);
|
|
+
|
|
void metricgroup__print(bool metrics, bool groups, char *filter,
|
|
bool raw, bool details);
|
|
bool metricgroup__has_metric(const char *metric);
|
|
--
|
|
2.27.0
|
|
|