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

perf metricgroup: Split up metricgroup__print() 



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: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarKajol 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c2337d67

tools/perf/util/metricgroup.c

+70 −54
Original line number Diff line number Diff line
@@ -493,49 +493,29 @@ static void metricgroup__print_strlist(struct strlist *metrics, bool raw) 
		putchar('\n');

}



void metricgroup__print(bool metrics, bool metricgroups, char *filter,

			bool raw, bool details)

static int metricgroup__print_pmu_event(struct pmu_event *pe,

					bool metricgroups, char *filter,

					bool raw, bool details,

					struct rblist *groups,

					struct strlist *metriclist)

{

	struct pmu_events_map *map = perf_pmu__find_map(NULL);

	struct pmu_event *pe;

	int i;

	struct rblist groups;

	struct rb_node *node, *next;

	struct strlist *metriclist = NULL;



	if (!map)

		return;



	if (!metricgroups) {

		metriclist = strlist__new(NULL, NULL);

		if (!metriclist)

			return;

	}



	rblist__init(&groups);

	groups.node_new = mep_new;

	groups.node_cmp = mep_cmp;

	groups.node_delete = mep_delete;

	for (i = 0; ; i++) {

	const char *g;

		pe = &map->table[i];

	char *omg, *mg;



		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;

			return 0;

		g = "No_group";

	}

		if (g) {

			char *omg;

			char *mg = strdup(g);



	if (!g)

		return 0;



	mg = strdup(g);



	if (!mg)

				return;

		return -ENOMEM;

	omg = mg;

	while ((g = strsep(&mg, ";")) != NULL) {

		struct mep *me;
@@ -551,12 +531,11 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, 
		else {

			if (asprintf(&s, "%s\n%*s%s]",

				     pe->metric_name, 8, "[", pe->desc) < 0)

						return;



				return -1;

			if (details) {

				if (asprintf(&s, "%s\n%*s%s]",

					     s, 8, "[", pe->metric_expr) < 0)

							return;

					return -1;

			}

		}
@@ -566,7 +545,7 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, 
		if (!metricgroups) {

			strlist__add(metriclist, s);

		} else {

					me = mep_lookup(&groups, g);

			me = mep_lookup(groups, g);

			if (!me)

				continue;

			strlist__add(me->metrics, s);
@@ -576,7 +555,44 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, 
			free(s);

	}

	free(omg);



	return 0;

}



void metricgroup__print(bool metrics, bool metricgroups, char *filter,

			bool raw, bool details)

{

	struct pmu_events_map *map = perf_pmu__find_map(NULL);

	struct pmu_event *pe;

	int i;

	struct rblist groups;

	struct rb_node *node, *next;

	struct strlist *metriclist = NULL;



	if (!map)

		return;



	if (!metricgroups) {

		metriclist = strlist__new(NULL, NULL);

		if (!metriclist)

			return;

	}



	rblist__init(&groups);

	groups.node_new = mep_new;

	groups.node_cmp = mep_cmp;

	groups.node_delete = mep_delete;

	for (i = 0; ; i++) {

		pe = &map->table[i];



		if (!pe->name && !pe->metric_group && !pe->metric_name)

			break;

		if (!pe->metric_expr)

			continue;

		if (metricgroup__print_pmu_event(pe, metricgroups, filter,

						 raw, details, &groups,

						 metriclist) < 0)

			return;

	}



	if (!filter || !rblist__empty(&groups)) {