Commit 75051724 authored by Ingo Molnar's avatar Ingo Molnar

perf report: Split out event processing helpers

- Introduce per event helper functions

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d80d338d
...@@ -50,6 +50,7 @@ struct ip_event { ...@@ -50,6 +50,7 @@ struct ip_event {
__u64 ip; __u64 ip;
__u32 pid, tid; __u32 pid, tid;
}; };
struct mmap_event { struct mmap_event {
struct perf_event_header header; struct perf_event_header header;
__u32 pid, tid; __u32 pid, tid;
...@@ -58,9 +59,10 @@ struct mmap_event { ...@@ -58,9 +59,10 @@ struct mmap_event {
__u64 pgoff; __u64 pgoff;
char filename[PATH_MAX]; char filename[PATH_MAX];
}; };
struct comm_event { struct comm_event {
struct perf_event_header header; struct perf_event_header header;
__u32 pid,tid; __u32 pid, tid;
char comm[16]; char comm[16];
}; };
...@@ -760,9 +762,8 @@ static void register_idle_thread(void) ...@@ -760,9 +762,8 @@ static void register_idle_thread(void)
static unsigned long total = 0, total_mmap = 0, total_comm = 0, total_unknown = 0; static unsigned long total = 0, total_mmap = 0, total_comm = 0, total_unknown = 0;
static int static int
process_event(event_t *event, unsigned long offset, unsigned long head) process_overflow_event(event_t *event, unsigned long offset, unsigned long head)
{ {
if (event->header.misc & PERF_EVENT_MISC_OVERFLOW) {
char level; char level;
int show = 0; int show = 0;
struct dso *dso = NULL; struct dso *dso = NULL;
...@@ -830,8 +831,13 @@ process_event(event_t *event, unsigned long offset, unsigned long head) ...@@ -830,8 +831,13 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
} }
} }
total++; total++;
} else switch (event->header.type) {
case PERF_EVENT_MMAP: { return 0;
}
static int
process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
{
struct thread *thread = threads__findnew(event->mmap.pid); struct thread *thread = threads__findnew(event->mmap.pid);
struct map *map = map__new(&event->mmap); struct map *map = map__new(&event->mmap);
...@@ -844,15 +850,19 @@ process_event(event_t *event, unsigned long offset, unsigned long head) ...@@ -844,15 +850,19 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
event->mmap.filename); event->mmap.filename);
if (thread == NULL || map == NULL) { if (thread == NULL || map == NULL) {
if (verbose) dprintf("problem processing PERF_EVENT_MMAP, skipping event.\n");
fprintf(stderr, "problem processing PERF_EVENT_MMAP, skipping event.\n");
return -1; return -1;
} }
thread__insert_map(thread, map); thread__insert_map(thread, map);
total_mmap++; total_mmap++;
break;
} return 0;
case PERF_EVENT_COMM: { }
static int
process_comm_event(event_t *event, unsigned long offset, unsigned long head)
{
struct thread *thread = threads__findnew(event->comm.pid); struct thread *thread = threads__findnew(event->comm.pid);
dprintf("%p [%p]: PERF_EVENT_COMM: %s:%d\n", dprintf("%p [%p]: PERF_EVENT_COMM: %s:%d\n",
...@@ -862,12 +872,27 @@ process_event(event_t *event, unsigned long offset, unsigned long head) ...@@ -862,12 +872,27 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
if (thread == NULL || if (thread == NULL ||
thread__set_comm(thread, event->comm.comm)) { thread__set_comm(thread, event->comm.comm)) {
fprintf(stderr, "problem processing PERF_EVENT_COMM, skipping event.\n"); dprintf("problem processing PERF_EVENT_COMM, skipping event.\n");
return -1; return -1;
} }
total_comm++; total_comm++;
break;
} return 0;
}
static int
process_event(event_t *event, unsigned long offset, unsigned long head)
{
if (event->header.misc & PERF_EVENT_MISC_OVERFLOW)
return process_overflow_event(event, offset, head);
switch (event->header.type) {
case PERF_EVENT_MMAP:
return process_mmap_event(event, offset, head);
case PERF_EVENT_COMM:
return process_comm_event(event, offset, head);
default: default:
return -1; return -1;
} }
...@@ -877,13 +902,13 @@ process_event(event_t *event, unsigned long offset, unsigned long head) ...@@ -877,13 +902,13 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
static int __cmd_report(void) static int __cmd_report(void)
{ {
int ret, rc = EXIT_FAILURE;
unsigned long offset = 0; unsigned long offset = 0;
unsigned long head = 0; unsigned long head = 0;
struct stat stat; struct stat stat;
char *buf;
event_t *event; event_t *event;
int ret, rc = EXIT_FAILURE;
uint32_t size; uint32_t size;
char *buf;
register_idle_thread(); register_idle_thread();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment