perf pmu: Support event aliases for non cpu// pmus (231bb2aa) · Commits · 戴 / test

tools/perf/util/parse-events.c

+26 −20

Original line number	Original line	Diff line number	Diff line
	@@ -1504,22 +1504,27 @@ static void perf_pmu__parse_init(void)
	struct perf_pmu_alias *alias;		struct perf_pmu_alias *alias;
	int len = 0;		int len = 0;

	pmu = perf_pmu__find("cpu");		pmu = NULL;
	if ((pmu == NULL) \|\| list_empty(&pmu->aliases)) {		while ((pmu = perf_pmu__scan(pmu)) != NULL) {
	perf_pmu_events_list_num = -1;
	return;
	}
	list_for_each_entry(alias, &pmu->aliases, list) {		list_for_each_entry(alias, &pmu->aliases, list) {
	if (strchr(alias->name, '-'))		if (strchr(alias->name, '-'))
	len++;		len++;
	len++;		len++;
	}		}
			}

			if (len == 0) {
			perf_pmu_events_list_num = -1;
			return;
			}
	perf_pmu_events_list = malloc(sizeof(struct perf_pmu_event_symbol) * len);		perf_pmu_events_list = malloc(sizeof(struct perf_pmu_event_symbol) * len);
	if (!perf_pmu_events_list)		if (!perf_pmu_events_list)
	return;		return;
	perf_pmu_events_list_num = len;		perf_pmu_events_list_num = len;

	len = 0;		len = 0;
			pmu = NULL;
			while ((pmu = perf_pmu__scan(pmu)) != NULL) {
	list_for_each_entry(alias, &pmu->aliases, list) {		list_for_each_entry(alias, &pmu->aliases, list) {
	struct perf_pmu_event_symbol *p = perf_pmu_events_list + len;		struct perf_pmu_event_symbol *p = perf_pmu_events_list + len;
	char *tmp = strchr(alias->name, '-');		char *tmp = strchr(alias->name, '-');
	@@ -1535,6 +1540,7 @@ static void perf_pmu__parse_init(void)
	len++;		len++;
	}		}
	}		}
			}
	qsort(perf_pmu_events_list, len,		qsort(perf_pmu_events_list, len,
	sizeof(struct perf_pmu_event_symbol), comp_pmu);		sizeof(struct perf_pmu_event_symbol), comp_pmu);

+25 −7

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/types.h>		#include <linux/types.h>
	#include "util.h"		#include "util.h"
			#include "pmu.h"
	#include "parse-events.h"		#include "parse-events.h"
	#include "parse-events-bison.h"		#include "parse-events-bison.h"

	@@ -236,15 +237,32 @@ PE_KERNEL_PMU_EVENT sep_dc
	struct list_head *head;		struct list_head *head;
	struct parse_events_term *term;		struct parse_events_term *term;
	struct list_head *list;		struct list_head *list;
			struct perf_pmu *pmu = NULL;
			int ok = 0;

			/* Add it for all PMUs that support the alias */
			ALLOC_LIST(list);
			while ((pmu = perf_pmu__scan(pmu)) != NULL) {
			struct perf_pmu_alias *alias;

			list_for_each_entry(alias, &pmu->aliases, list) {
			if (!strcasecmp(alias->name, $1)) {
	ALLOC_LIST(head);		ALLOC_LIST(head);
	ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,		ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
	$1, 1, &@1, NULL));		$1, 1, &@1, NULL));
	list_add_tail(&term->list, head);		list_add_tail(&term->list, head);

	ALLOC_LIST(list);		if (!parse_events_add_pmu(data, list,
	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));		pmu->name, head)) {
			ok++;
			}

	parse_events_terms__delete(head);		parse_events_terms__delete(head);
			}
			}
			}
			if (!ok)
			YYABORT;
	$$ = list;		$$ = list;
	}		}
	\|		\|