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

Commit 7c2f7afd authored by Robert Richter's avatar Robert Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Update event names from header description 



Name events based on the event description in the perf.data header.

Example output:

 $ perf report | grep '^#.*event'
 # event : name = ibs_op/cnt_ctl=1/GH, type = 7, config = 0x80000, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 0, precise_ip = 0, id = { 49, 50, 51, 52, 53, 54, 55, 56 }
 # event : name = ibs_fetch/config=0/, type = 6, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0, id = { 57, 58, 59, 60, 61, 62, 63, 64 }
 # Samples: 20K of event 'ibs_op/cnt_ctl=1/GH'
 # Samples: 4K of event 'ibs_fetch/config=0/'

Note the new pmu event syntax of the names.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1345144224-27280-8-git-send-email-robert.richter@amd.com


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

tools/perf/util/header.c

+51 −1
Original line number Diff line number Diff line
@@ -1556,6 +1556,56 @@ static int process_build_id(struct perf_file_section *section, 
	return 0;

}



static struct perf_evsel *

perf_evlist__find_by_index(struct perf_evlist *evlist, int idx)

{

	struct perf_evsel *evsel;



	list_for_each_entry(evsel, &evlist->entries, node) {

		if (evsel->idx == idx)

			return evsel;

	}



	return NULL;

}



static void

perf_evlist__set_event_name(struct perf_evlist *evlist, struct perf_evsel *event)

{

	struct perf_evsel *evsel;



	if (!event->name)

		return;



	evsel = perf_evlist__find_by_index(evlist, event->idx);

	if (!evsel)

		return;



	if (evsel->name)

		return;



	evsel->name = strdup(event->name);

}



static int

process_event_desc(struct perf_file_section *section __unused,

		   struct perf_header *header, int feat __unused, int fd,

		   void *data __used)

{

	struct perf_session *session = container_of(header, struct perf_session, header);

	struct perf_evsel *evsel, *events = read_event_desc(header, fd);



	if (!events)

		return 0;



	for (evsel = events; evsel->attr.size; evsel++)

		perf_evlist__set_event_name(session->evlist, evsel);



	free_event_desc(events);



	return 0;

}



struct feature_ops {

	int (*write)(int fd, struct perf_header *h, struct perf_evlist *evlist);

	void (*print)(struct perf_header *h, int fd, FILE *fp);
@@ -1589,7 +1639,7 @@ static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = { 
	FEAT_OPA(HEADER_CPUDESC,	cpudesc),

	FEAT_OPA(HEADER_CPUID,		cpuid),

	FEAT_OPA(HEADER_TOTAL_MEM,	total_mem),

	FEAT_OPA(HEADER_EVENT_DESC,	event_desc),

	FEAT_OPP(HEADER_EVENT_DESC,	event_desc),

	FEAT_OPA(HEADER_CMDLINE,	cmdline),

	FEAT_OPF(HEADER_CPU_TOPOLOGY,	cpu_topology),

	FEAT_OPF(HEADER_NUMA_TOPOLOGY,	numa_topology),