Commit dedb76d3 authored by John Garry's avatar John Garry Committed by Arnaldo Carvalho de Melo
Browse files

perf metricgroup: Make find_metric() public with name change 



Function find_metric() is required for the metric processing in the
pmu-events testcase, so make it public. Also change the name to include
"metricgroup".

Tested-by: default avatarPaul A. Clarke <pc@us.ibm.com>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.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: linuxarm@huawei.com
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/1617791570-165223-2-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 69baf1a2

tools/perf/util/metricgroup.c

+3 −2
Original line number Diff line number Diff line
@@ -900,7 +900,8 @@ static int __add_metric(struct list_head *metric_list, 
		    (match_metric(__pe->metric_group, __metric) ||	\

		     match_metric(__pe->metric_name, __metric)))



static struct pmu_event *find_metric(const char *metric, struct pmu_events_map *map)

struct pmu_event *metricgroup__find_metric(const char *metric,

					   struct pmu_events_map *map)

{

	struct pmu_event *pe;

	int i;
@@ -985,7 +986,7 @@ static int __resolve_metric(struct metric *m, 
			struct expr_id *parent;

			struct pmu_event *pe;



			pe = find_metric(cur->key, map);

			pe = metricgroup__find_metric(cur->key, map);

			if (!pe)

				continue;

tools/perf/util/metricgroup.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ int metricgroup__parse_groups(const struct option *opt, 
			      bool metric_no_group,

			      bool metric_no_merge,

			      struct rblist *metric_events);



struct pmu_event *metricgroup__find_metric(const char *metric,

					   struct pmu_events_map *map);

int metricgroup__parse_groups_test(struct evlist *evlist,

				   struct pmu_events_map *map,

				   const char *str,