Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42634bc7 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu: Let pmu's with no events show up on perf list 



perf list only lists PMUs with events.  Add a flag to cause a PMU to be
also listed separately.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1414061124-26830-3-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/pmu.c

+11 −2
Original line number Diff line number Diff line
@@ -747,15 +747,18 @@ void print_pmu_events(const char *event_glob, bool name_only) 


	pmu = NULL;

	len = 0;

	while ((pmu = perf_pmu__scan(pmu)) != NULL)

	while ((pmu = perf_pmu__scan(pmu)) != NULL) {

		list_for_each_entry(alias, &pmu->aliases, list)

			len++;

		if (pmu->selectable)

			len++;

	}

	aliases = malloc(sizeof(char *) * len);

	if (!aliases)

		return;

	pmu = NULL;

	j = 0;

	while ((pmu = perf_pmu__scan(pmu)) != NULL)

	while ((pmu = perf_pmu__scan(pmu)) != NULL) {

		list_for_each_entry(alias, &pmu->aliases, list) {

			char *name = format_alias(buf, sizeof(buf), pmu, alias);

			bool is_cpu = !strcmp(pmu->name, "cpu");
@@ -772,6 +775,12 @@ void print_pmu_events(const char *event_glob, bool name_only) 
			aliases[j] = strdup(aliases[j]);

			j++;

		}

		if (pmu->selectable) {

			scnprintf(buf, sizeof(buf), "%s//", pmu->name);

			aliases[j] = strdup(buf);

			j++;

		}

	}

	len = j;

	qsort(aliases, len, sizeof(char *), cmp_string);

	for (j = 0; j < len; j++) {

tools/perf/util/pmu.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ struct perf_event_attr; 
struct perf_pmu {

	char *name;

	__u32 type;

	bool selectable;

	struct perf_event_attr *default_config;

	struct cpu_map *cpus;

	struct list_head format;  /* HEAD struct perf_pmu_format -> list */