perf: Convert perf header attrs into attr events
Bypasses the attr perf header code and replaces it with a synthesized event and processing function that accomplishes the same thing, used when reading/writing perf data to/from a pipe. Making the attrs into events allows them to be streamed over a pipe along with the rest of the header data (in later patches). It also paves the way to allowing events to be added and removed from perf sessions dynamically. Signed-off-by: Tom Zanussi <tzanussi@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-6-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@ -200,6 +200,8 @@ static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
|
||||
handler->throttle = process_event_stub;
|
||||
if (handler->unthrottle == NULL)
|
||||
handler->unthrottle = process_event_stub;
|
||||
if (handler->attr == NULL)
|
||||
handler->attr = process_event_stub;
|
||||
}
|
||||
|
||||
static const char *event__name[] = {
|
||||
@ -213,6 +215,7 @@ static const char *event__name[] = {
|
||||
[PERF_RECORD_FORK] = "FORK",
|
||||
[PERF_RECORD_READ] = "READ",
|
||||
[PERF_RECORD_SAMPLE] = "SAMPLE",
|
||||
[PERF_RECORD_HEADER_ATTR] = "ATTR",
|
||||
};
|
||||
|
||||
unsigned long event__total[PERF_RECORD_HEADER_MAX];
|
||||
@ -279,6 +282,26 @@ static void event__read_swap(event_t *self)
|
||||
self->read.id = bswap_64(self->read.id);
|
||||
}
|
||||
|
||||
static void event__attr_swap(event_t *self)
|
||||
{
|
||||
size_t size;
|
||||
|
||||
self->attr.attr.type = bswap_32(self->attr.attr.type);
|
||||
self->attr.attr.size = bswap_32(self->attr.attr.size);
|
||||
self->attr.attr.config = bswap_64(self->attr.attr.config);
|
||||
self->attr.attr.sample_period = bswap_64(self->attr.attr.sample_period);
|
||||
self->attr.attr.sample_type = bswap_64(self->attr.attr.sample_type);
|
||||
self->attr.attr.read_format = bswap_64(self->attr.attr.read_format);
|
||||
self->attr.attr.wakeup_events = bswap_32(self->attr.attr.wakeup_events);
|
||||
self->attr.attr.bp_type = bswap_32(self->attr.attr.bp_type);
|
||||
self->attr.attr.bp_addr = bswap_64(self->attr.attr.bp_addr);
|
||||
self->attr.attr.bp_len = bswap_64(self->attr.attr.bp_len);
|
||||
|
||||
size = self->header.size;
|
||||
size -= (void *)&self->attr.id - (void *)self;
|
||||
mem_bswap_64(self->attr.id, size);
|
||||
}
|
||||
|
||||
typedef void (*event__swap_op)(event_t *self);
|
||||
|
||||
static event__swap_op event__swap_ops[] = {
|
||||
@ -289,6 +312,7 @@ static event__swap_op event__swap_ops[] = {
|
||||
[PERF_RECORD_LOST] = event__all64_swap,
|
||||
[PERF_RECORD_READ] = event__read_swap,
|
||||
[PERF_RECORD_SAMPLE] = event__all64_swap,
|
||||
[PERF_RECORD_HEADER_ATTR] = event__attr_swap,
|
||||
[PERF_RECORD_HEADER_MAX] = NULL,
|
||||
};
|
||||
|
||||
@ -329,6 +353,8 @@ static int perf_session__process_event(struct perf_session *self,
|
||||
return ops->throttle(event, self);
|
||||
case PERF_RECORD_UNTHROTTLE:
|
||||
return ops->unthrottle(event, self);
|
||||
case PERF_RECORD_HEADER_ATTR:
|
||||
return ops->attr(event, self);
|
||||
default:
|
||||
self->unknown_events++;
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user