Commit 8f18aec5 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf report: Fix per task mult-counter stat reporting 



Brice Goglin reported:

> I can easily sort them by thread id, but I don't know how to match
> my 4 events with each group of 4 lines.

Also report the counter id and the time running/enabled
stats (in case the counter got time-shared).

Reported-by: default avatarBrice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Tested-by: default avatarBrice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1c222bce

tools/perf/builtin-report.c

+27 −4
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ struct read_event { 
	struct perf_event_header header;

	u32 pid,tid;

	u64 value;

	u64 format[3];

	u64 time_enabled;

	u64 time_running;

	u64 id;

};



typedef union event_union {
@@ -1690,14 +1692,37 @@ static void trace_event(event_t *event) 
	dprintf(".\n");

}



static struct perf_header	*header;



static struct perf_counter_attr *perf_header__find_attr(u64 id)

{

	int i;



	for (i = 0; i < header->attrs; i++) {

		struct perf_header_attr *attr = header->attr[i];

		int j;



		for (j = 0; j < attr->ids; j++) {

			if (attr->id[j] == id)

				return &attr->attr;

		}

	}



	return NULL;

}



static int

process_read_event(event_t *event, unsigned long offset, unsigned long head)

{

	dprintf("%p [%p]: PERF_EVENT_READ: %d %d %Lu\n",

	struct perf_counter_attr *attr = perf_header__find_attr(event->read.id);



	dprintf("%p [%p]: PERF_EVENT_READ: %d %d %s %Lu\n",

			(void *)(offset + head),

			(void *)(long)(event->header.size),

			event->read.pid,

			event->read.tid,

			attr ? __event_name(attr->type, attr->config)

			     : "FAIL",

			event->read.value);



	return 0;
@@ -1743,8 +1768,6 @@ process_event(event_t *event, unsigned long offset, unsigned long head) 
	return 0;

}



static struct perf_header	*header;



static u64 perf_header__sample_type(void)

{

	u64 sample_type = 0;

tools/perf/util/parse-events.c

+7 −1
Original line number Diff line number Diff line
@@ -223,9 +223,15 @@ char *event_name(int counter) 
{

	u64 config = attrs[counter].config;

	int type = attrs[counter].type;



	return __event_name(type, config);

}



char *__event_name(int type, u64 config)

{

	static char buf[32];



	if (attrs[counter].type == PERF_TYPE_RAW) {

	if (type == PERF_TYPE_RAW) {

		sprintf(buf, "raw 0x%llx", config);

		return buf;

	}

tools/perf/util/parse-events.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ extern int nr_counters; 
extern struct perf_counter_attr attrs[MAX_COUNTERS];



extern char *event_name(int ctr);

extern char *__event_name(int type, u64 config);



extern int parse_events(const struct option *opt, const char *str, int unset);

CRA Git | Maintained and supported by SUSTech CRA and CCSE