perf report: Add consistent spacing rules
[deliverable/linux.git] / Documentation / perf_counter / builtin-report.c
index 412d524dd6581e7b572b0bdc6b0b54edbb8020e9..e930b4e02335d50a03dc8135064c02a7bbe55c4c 100644 (file)
@@ -1,10 +1,19 @@
-#include "util/util.h"
+/*
+ * builtin-report.c
+ *
+ * Builtin report command: Analyze the perf.data input file,
+ * look up and read DSOs and symbol information and display
+ * a histogram of results, along various sorting keys.
+ */
 #include "builtin.h"
 
+#include "util/util.h"
+
 #include "util/list.h"
 #include "util/cache.h"
 #include "util/rbtree.h"
 #include "util/symbol.h"
+#include "util/string.h"
 
 #include "perf.h"
 
 
 static char            const *input_name = "perf.data";
 static char            *vmlinux = NULL;
-static char            *sort_order = "pid,symbol";
+
+static char            default_sort_order[] = "comm,dso";
+static char            *sort_order = default_sort_order;
+
 static int             input;
 static int             show_mask = SHOW_KERNEL | SHOW_USER | SHOW_HV;
 
 static int             dump_trace = 0;
+#define dprintf(x...)  do { if (dump_trace) printf(x); } while (0)
+
 static int             verbose;
+static int             full_paths;
 
 static unsigned long   page_size;
 static unsigned long   mmap_window = 32;
@@ -38,6 +53,7 @@ struct ip_event {
        __u64 ip;
        __u32 pid, tid;
 };
+
 struct mmap_event {
        struct perf_event_header header;
        __u32 pid, tid;
@@ -46,9 +62,10 @@ struct mmap_event {
        __u64 pgoff;
        char filename[PATH_MAX];
 };
+
 struct comm_event {
        struct perf_event_header header;
-       __u32 pid,tid;
+       __u32 pid, tid;
        char comm[16];
 };
 
@@ -82,24 +99,26 @@ static struct dso *dsos__findnew(const char *name)
        struct dso *dso = dsos__find(name);
        int nr;
 
-       if (dso == NULL) {
-               dso = dso__new(name, 0);
-               if (!dso)
-                       goto out_delete_dso;
+       if (dso)
+               return dso;
 
-               nr = dso__load(dso, NULL);
-               if (nr < 0) {
-                       fprintf(stderr, "Failed to open: %s\n", name);
-                       goto out_delete_dso;
-               }
-               if (!nr) {
-                       fprintf(stderr,
-               "Failed to find debug symbols for: %s, maybe install a debug package?\n",
-                                       name);
-               }
+       dso = dso__new(name, 0);
+       if (!dso)
+               goto out_delete_dso;
 
-               dsos__add(dso);
+       nr = dso__load(dso, NULL, verbose);
+       if (nr < 0) {
+               if (verbose)
+                       fprintf(stderr, "Failed to open: %s\n", name);
+               goto out_delete_dso;
        }
+       if (!nr && verbose) {
+               fprintf(stderr,
+               "No symbols found in: %s, maybe install a debug package?\n",
+                               name);
+       }
+
+       dsos__add(dso);
 
        return dso;
 
@@ -124,7 +143,7 @@ static int load_kernel(void)
        if (!kernel_dso)
                return -1;
 
-       err = dso__load_kernel(kernel_dso, vmlinux, NULL);
+       err = dso__load_kernel(kernel_dso, vmlinux, NULL, verbose);
        if (err) {
                dso__delete(kernel_dso);
                kernel_dso = NULL;
@@ -134,6 +153,20 @@ static int load_kernel(void)
        return err;
 }
 
+static char __cwd[PATH_MAX];
+static char *cwd = __cwd;
+static int cwdlen;
+
+static int strcommon(const char *pathname)
+{
+       int n = 0;
+
+       while (pathname[n] == cwd[n] && n < cwdlen)
+               ++n;
+
+       return n;
+}
+
 struct map {
        struct list_head node;
        uint64_t         start;
@@ -147,11 +180,24 @@ static struct map *map__new(struct mmap_event *event)
        struct map *self = malloc(sizeof(*self));
 
        if (self != NULL) {
+               const char *filename = event->filename;
+               char newfilename[PATH_MAX];
+
+               if (cwd) {
+                       int n = strcommon(filename);
+
+                       if (n == cwdlen) {
+                               snprintf(newfilename, sizeof(newfilename),
+                                        ".%s", filename + n);
+                               filename = newfilename;
+                       }
+               }
+
                self->start = event->start;
                self->end   = event->start + event->len;
                self->pgoff = event->pgoff;
 
-               self->dso = dsos__findnew(event->filename);
+               self->dso = dsos__findnew(filename);
                if (self->dso == NULL)
                        goto out_delete;
        }
@@ -176,7 +222,9 @@ static struct thread *thread__new(pid_t pid)
 
        if (self != NULL) {
                self->pid = pid;
-               self->comm = NULL;
+               self->comm = malloc(32);
+               if (self->comm)
+                       snprintf(self->comm, 32, ":%d", self->pid);
                INIT_LIST_HEAD(&self->maps);
        }
 
@@ -185,11 +233,14 @@ static struct thread *thread__new(pid_t pid)
 
 static int thread__set_comm(struct thread *self, const char *comm)
 {
+       if (self->comm)
+               free(self->comm);
        self->comm = strdup(comm);
        return self->comm ? 0 : -ENOMEM;
 }
 
 static struct rb_root threads;
+static struct thread *last_match;
 
 static struct thread *threads__findnew(pid_t pid)
 {
@@ -197,12 +248,22 @@ static struct thread *threads__findnew(pid_t pid)
        struct rb_node *parent = NULL;
        struct thread *th;
 
+       /*
+        * Font-end cache - PID lookups come in blocks,
+        * so most of the time we dont have to look up
+        * the full rbtree:
+        */
+       if (last_match && last_match->pid == pid)
+               return last_match;
+
        while (*p != NULL) {
                parent = *p;
                th = rb_entry(parent, struct thread, rb_node);
 
-               if (th->pid == pid)
+               if (th->pid == pid) {
+                       last_match = th;
                        return th;
+               }
 
                if (pid < th->pid)
                        p = &(*p)->rb_left;
@@ -214,7 +275,9 @@ static struct thread *threads__findnew(pid_t pid)
        if (th != NULL) {
                rb_link_node(&th->rb_node, parent, p);
                rb_insert_color(&th->rb_node, &threads);
+               last_match = th;
        }
+
        return th;
 }
 
@@ -266,9 +329,12 @@ struct sort_entry {
        char *header;
 
        int64_t (*cmp)(struct hist_entry *, struct hist_entry *);
+       int64_t (*collapse)(struct hist_entry *, struct hist_entry *);
        size_t  (*print)(FILE *fp, struct hist_entry *);
 };
 
+/* --sort pid */
+
 static int64_t
 sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
 {
@@ -278,17 +344,25 @@ sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
 static size_t
 sort__thread_print(FILE *fp, struct hist_entry *self)
 {
-       return fprintf(fp, " %16s:%5d", self->thread->comm ?: "", self->thread->pid);
+       return fprintf(fp, "%16s:%5d", self->thread->comm ?: "", self->thread->pid);
 }
 
 static struct sort_entry sort_thread = {
-       .header = "         Command: Pid ",
+       .header = "         Command:  Pid",
        .cmp    = sort__thread_cmp,
        .print  = sort__thread_print,
 };
 
+/* --sort comm */
+
 static int64_t
 sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+       return right->thread->pid - left->thread->pid;
+}
+
+static int64_t
+sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
 {
        char *comm_l = left->thread->comm;
        char *comm_r = right->thread->comm;
@@ -308,15 +382,18 @@ sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
 static size_t
 sort__comm_print(FILE *fp, struct hist_entry *self)
 {
-       return fprintf(fp, " %16s", self->thread->comm ?: "<unknown>");
+       return fprintf(fp, "%16s", self->thread->comm);
 }
 
 static struct sort_entry sort_comm = {
-       .header = "         Command",
-       .cmp    = sort__comm_cmp,
-       .print  = sort__comm_print,
+       .header         = "         Command",
+       .cmp            = sort__comm_cmp,
+       .collapse       = sort__comm_collapse,
+       .print          = sort__comm_print,
 };
 
+/* --sort dso */
+
 static int64_t
 sort__dso_cmp(struct hist_entry *left, struct hist_entry *right)
 {
@@ -338,15 +415,20 @@ sort__dso_cmp(struct hist_entry *left, struct hist_entry *right)
 static size_t
 sort__dso_print(FILE *fp, struct hist_entry *self)
 {
-       return fprintf(fp, " %64s", self->dso ? self->dso->name : "<unknown>");
+       if (self->dso)
+               return fprintf(fp, "%-25s", self->dso->name);
+
+       return fprintf(fp, "%016llx         ", (__u64)self->ip);
 }
 
 static struct sort_entry sort_dso = {
-       .header = "                                                    Shared Object",
+       .header = "Shared Object            ",
        .cmp    = sort__dso_cmp,
        .print  = sort__dso_print,
 };
 
+/* --sort symbol */
+
 static int64_t
 sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
 {
@@ -367,21 +449,24 @@ sort__sym_print(FILE *fp, struct hist_entry *self)
        size_t ret = 0;
 
        if (verbose)
-               ret += fprintf(fp, " %#018llx", (unsigned long long)self->ip);
+               ret += fprintf(fp, "%#018llx  ", (__u64)self->ip);
 
-       ret += fprintf(fp, " %s: %s",
-                       self->dso ? self->dso->name : "<unknown>",
-                       self->sym ? self->sym->name : "<unknown>");
+       if (self->sym)
+               ret += fprintf(fp, "%s", self->sym->name);
+       else
+               ret += fprintf(fp, "%#016llx", (__u64)self->ip);
 
        return ret;
 }
 
 static struct sort_entry sort_sym = {
-       .header = "Shared Object: Symbol",
+       .header = "Symbol",
        .cmp    = sort__sym_cmp,
        .print  = sort__sym_print,
 };
 
+static int sort__need_collapse = 0;
+
 struct sort_dimension {
        char *name;
        struct sort_entry *entry;
@@ -407,36 +492,48 @@ static int sort_dimension__add(char *tok)
                if (sd->taken)
                        continue;
 
-               if (strcmp(tok, sd->name))
+               if (strncasecmp(tok, sd->name, strlen(tok)))
                        continue;
 
+               if (sd->entry->collapse)
+                       sort__need_collapse = 1;
+
                list_add_tail(&sd->entry->list, &hist_entry__sort_list);
                sd->taken = 1;
+
                return 0;
        }
 
        return -ESRCH;
 }
 
-static void setup_sorting(void)
+static int64_t
+hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
 {
-       char *tmp, *tok, *str = strdup(sort_order);
+       struct sort_entry *se;
+       int64_t cmp = 0;
 
-       for (tok = strtok_r(str, ", ", &tmp);
-                       tok; tok = strtok_r(NULL, ", ", &tmp))
-               sort_dimension__add(tok);
+       list_for_each_entry(se, &hist_entry__sort_list, list) {
+               cmp = se->cmp(left, right);
+               if (cmp)
+                       break;
+       }
 
-       free(str);
+       return cmp;
 }
 
 static int64_t
-hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
+hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
 {
        struct sort_entry *se;
        int64_t cmp = 0;
 
        list_for_each_entry(se, &hist_entry__sort_list, list) {
-               cmp = se->cmp(left, right);
+               int64_t (*f)(struct hist_entry *, struct hist_entry *);
+
+               f = se->collapse ?: se->cmp;
+
+               cmp = f(left, right);
                if (cmp)
                        break;
        }
@@ -451,13 +548,15 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
        size_t ret;
 
        if (total_samples) {
-               ret = fprintf(fp, "    %5.2f%%",
+               ret = fprintf(fp, "   %6.2f%%",
                                (self->count * 100.0) / total_samples);
        } else
                ret = fprintf(fp, "%12d ", self->count);
 
-       list_for_each_entry(se, &hist_entry__sort_list, list)
+       list_for_each_entry(se, &hist_entry__sort_list, list) {
+               fprintf(fp, "  ");
                ret += se->print(fp, self);
+       }
 
        ret += fprintf(fp, "\n");
 
@@ -513,6 +612,64 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
        return 0;
 }
 
+static void hist_entry__free(struct hist_entry *he)
+{
+       free(he);
+}
+
+/*
+ * collapse the histogram
+ */
+
+static struct rb_root collapse_hists;
+
+static void collapse__insert_entry(struct hist_entry *he)
+{
+       struct rb_node **p = &collapse_hists.rb_node;
+       struct rb_node *parent = NULL;
+       struct hist_entry *iter;
+       int64_t cmp;
+
+       while (*p != NULL) {
+               parent = *p;
+               iter = rb_entry(parent, struct hist_entry, rb_node);
+
+               cmp = hist_entry__collapse(iter, he);
+
+               if (!cmp) {
+                       iter->count += he->count;
+                       hist_entry__free(he);
+                       return;
+               }
+
+               if (cmp < 0)
+                       p = &(*p)->rb_left;
+               else
+                       p = &(*p)->rb_right;
+       }
+
+       rb_link_node(&he->rb_node, parent, p);
+       rb_insert_color(&he->rb_node, &collapse_hists);
+}
+
+static void collapse__resort(void)
+{
+       struct rb_node *next;
+       struct hist_entry *n;
+
+       if (!sort__need_collapse)
+               return;
+
+       next = rb_first(&hist);
+       while (next) {
+               n = rb_entry(next, struct hist_entry, rb_node);
+               next = rb_next(&n->rb_node);
+
+               rb_erase(&n->rb_node, &hist);
+               collapse__insert_entry(n);
+       }
+}
+
 /*
  * reverse the map, sort on count.
  */
@@ -541,14 +698,20 @@ static void output__insert_entry(struct hist_entry *he)
 
 static void output__resort(void)
 {
-       struct rb_node *next = rb_first(&hist);
+       struct rb_node *next;
        struct hist_entry *n;
+       struct rb_root *tree = &hist;
+
+       if (sort__need_collapse)
+               tree = &collapse_hists;
+
+       next = rb_first(tree);
 
        while (next) {
                n = rb_entry(next, struct hist_entry, rb_node);
                next = rb_next(&n->rb_node);
 
-               rb_erase(&n->rb_node, &hist);
+               rb_erase(&n->rb_node, tree);
                output__insert_entry(n);
        }
 }
@@ -560,18 +723,21 @@ static size_t output__fprintf(FILE *fp, uint64_t total_samples)
        struct rb_node *nd;
        size_t ret = 0;
 
+       fprintf(fp, "\n");
+       fprintf(fp, "#\n");
+       fprintf(fp, "# (%Ld profiler events)\n", (__u64)total_samples);
        fprintf(fp, "#\n");
 
        fprintf(fp, "# Overhead");
        list_for_each_entry(se, &hist_entry__sort_list, list)
-               fprintf(fp, " %s", se->header);
+               fprintf(fp, "  %s", se->header);
        fprintf(fp, "\n");
 
        fprintf(fp, "# ........");
        list_for_each_entry(se, &hist_entry__sort_list, list) {
                int i;
 
-               fprintf(fp, " ");
+               fprintf(fp, "  ");
                for (i = 0; i < strlen(se->header); i++)
                        fprintf(fp, ".");
        }
@@ -584,20 +750,188 @@ static size_t output__fprintf(FILE *fp, uint64_t total_samples)
                ret += hist_entry__fprintf(fp, pos, total_samples);
        }
 
+       if (!strcmp(sort_order, default_sort_order)) {
+               fprintf(fp, "#\n");
+               fprintf(fp, "# (For more details, try: perf report --sort comm,dso,symbol)\n");
+               fprintf(fp, "#\n");
+       }
+       fprintf(fp, "\n");
+
        return ret;
 }
 
+static void register_idle_thread(void)
+{
+       struct thread *thread = threads__findnew(0);
+
+       if (thread == NULL ||
+                       thread__set_comm(thread, "[idle]")) {
+               fprintf(stderr, "problem inserting idle task.\n");
+               exit(-1);
+       }
+}
+
+static unsigned long total = 0, total_mmap = 0, total_comm = 0, total_unknown = 0;
+
+static int
+process_overflow_event(event_t *event, unsigned long offset, unsigned long head)
+{
+       char level;
+       int show = 0;
+       struct dso *dso = NULL;
+       struct thread *thread = threads__findnew(event->ip.pid);
+       uint64_t ip = event->ip.ip;
+       struct map *map = NULL;
+
+       dprintf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n",
+               (void *)(offset + head),
+               (void *)(long)(event->header.size),
+               event->header.misc,
+               event->ip.pid,
+               (void *)(long)ip);
+
+       dprintf(" ... thread: %s:%d\n", thread->comm, thread->pid);
+
+       if (thread == NULL) {
+               fprintf(stderr, "problem processing %d event, skipping it.\n",
+                       event->header.type);
+               return -1;
+       }
+
+       if (event->header.misc & PERF_EVENT_MISC_KERNEL) {
+               show = SHOW_KERNEL;
+               level = 'k';
+
+               dso = kernel_dso;
+
+               dprintf(" ...... dso: %s\n", dso->name);
+
+       } else if (event->header.misc & PERF_EVENT_MISC_USER) {
+
+               show = SHOW_USER;
+               level = '.';
+
+               map = thread__find_map(thread, ip);
+               if (map != NULL) {
+                       dso = map->dso;
+                       ip -= map->start + map->pgoff;
+               } else {
+                       /*
+                        * If this is outside of all known maps,
+                        * and is a negative address, try to look it
+                        * up in the kernel dso, as it might be a
+                        * vsyscall (which executes in user-mode):
+                        */
+                       if ((long long)ip < 0)
+                               dso = kernel_dso;
+               }
+               dprintf(" ...... dso: %s\n", dso ? dso->name : "<not found>");
+
+       } else {
+               show = SHOW_HV;
+               level = 'H';
+               dprintf(" ...... dso: [hypervisor]\n");
+       }
+
+       if (show & show_mask) {
+               struct symbol *sym = dso__find_symbol(dso, ip);
+
+               if (hist_entry__add(thread, map, dso, sym, ip, level)) {
+                       fprintf(stderr,
+               "problem incrementing symbol count, skipping event\n");
+                       return -1;
+               }
+       }
+       total++;
+
+       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 map *map = map__new(&event->mmap);
+
+       dprintf("%p [%p]: PERF_EVENT_MMAP: [%p(%p) @ %p]: %s\n",
+               (void *)(offset + head),
+               (void *)(long)(event->header.size),
+               (void *)(long)event->mmap.start,
+               (void *)(long)event->mmap.len,
+               (void *)(long)event->mmap.pgoff,
+               event->mmap.filename);
+
+       if (thread == NULL || map == NULL) {
+               dprintf("problem processing PERF_EVENT_MMAP, skipping event.\n");
+               return 0;
+       }
+
+       thread__insert_map(thread, map);
+       total_mmap++;
+
+       return 0;
+}
+
+static int
+process_comm_event(event_t *event, unsigned long offset, unsigned long head)
+{
+       struct thread *thread = threads__findnew(event->comm.pid);
+
+       dprintf("%p [%p]: PERF_EVENT_COMM: %s:%d\n",
+               (void *)(offset + head),
+               (void *)(long)(event->header.size),
+               event->comm.comm, event->comm.pid);
+
+       if (thread == NULL ||
+           thread__set_comm(thread, event->comm.comm)) {
+               dprintf("problem processing PERF_EVENT_COMM, skipping event.\n");
+               return -1;
+       }
+       total_comm++;
+
+       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);
+
+       /*
+        * We dont process them right now but they are fine:
+        */
+       case PERF_EVENT_MUNMAP:
+       case PERF_EVENT_PERIOD:
+       case PERF_EVENT_THROTTLE:
+       case PERF_EVENT_UNTHROTTLE:
+               return 0;
+
+       default:
+               return -1;
+       }
+
+       return 0;
+}
 
 static int __cmd_report(void)
 {
+       int ret, rc = EXIT_FAILURE;
        unsigned long offset = 0;
        unsigned long head = 0;
        struct stat stat;
-       char *buf;
        event_t *event;
-       int ret, rc = EXIT_FAILURE;
        uint32_t size;
-       unsigned long total = 0, total_mmap = 0, total_comm = 0, total_unknown = 0;
+       char *buf;
+
+       register_idle_thread();
 
        input = open(input_name, O_RDONLY);
        if (input < 0) {
@@ -621,6 +955,16 @@ static int __cmd_report(void)
                return EXIT_FAILURE;
        }
 
+       if (!full_paths) {
+               if (getcwd(__cwd, sizeof(__cwd)) == NULL) {
+                       perror("failed to get the current directory");
+                       return EXIT_FAILURE;
+               }
+               cwdlen = strlen(cwd);
+       } else {
+               cwd = NULL;
+               cwdlen = 0;
+       }
 remap:
        buf = (char *)mmap(NULL, page_size * mmap_window, PROT_READ,
                           MAP_SHARED, input, offset);
@@ -649,110 +993,13 @@ more:
        }
 
        size = event->header.size;
-       if (!size)
-               goto broken_event;
-
-       if (event->header.misc & PERF_EVENT_MISC_OVERFLOW) {
-               char level;
-               int show = 0;
-               struct dso *dso = NULL;
-               struct thread *thread = threads__findnew(event->ip.pid);
-               uint64_t ip = event->ip.ip;
-               struct map *map = NULL;
-
-               if (dump_trace) {
-                       fprintf(stderr, "%p [%p]: PERF_EVENT (IP, %d): %d: %p\n",
-                               (void *)(offset + head),
-                               (void *)(long)(event->header.size),
-                               event->header.misc,
-                               event->ip.pid,
-                               (void *)(long)ip);
-               }
 
-               if (thread == NULL) {
-                       fprintf(stderr, "problem processing %d event, skipping it.\n",
-                               event->header.type);
-                       goto broken_event;
-               }
-
-               if (event->header.misc & PERF_EVENT_MISC_KERNEL) {
-                       show = SHOW_KERNEL;
-                       level = 'k';
-
-                       dso = kernel_dso;
+       if (!size || process_event(event, offset, head) < 0) {
 
-               } else if (event->header.misc & PERF_EVENT_MISC_USER) {
-
-                       show = SHOW_USER;
-                       level = '.';
-
-                       map = thread__find_map(thread, ip);
-                       if (map != NULL) {
-                               dso = map->dso;
-                               ip -= map->start + map->pgoff;
-                       }
-
-               } else {
-                       show = SHOW_HV;
-                       level = 'H';
-               }
-
-               if (show & show_mask) {
-                       struct symbol *sym = dso__find_symbol(dso, ip);
-
-                       if (hist_entry__add(thread, map, dso, sym, ip, level)) {
-                               fprintf(stderr,
-               "problem incrementing symbol count, skipping event\n");
-                               goto broken_event;
-                       }
-               }
-               total++;
-       } else switch (event->header.type) {
-       case PERF_EVENT_MMAP: {
-               struct thread *thread = threads__findnew(event->mmap.pid);
-               struct map *map = map__new(&event->mmap);
-
-               if (dump_trace) {
-                       fprintf(stderr, "%p [%p]: PERF_EVENT_MMAP: [%p(%p) @ %p]: %s\n",
-                               (void *)(offset + head),
-                               (void *)(long)(event->header.size),
-                               (void *)(long)event->mmap.start,
-                               (void *)(long)event->mmap.len,
-                               (void *)(long)event->mmap.pgoff,
-                               event->mmap.filename);
-               }
-               if (thread == NULL || map == NULL) {
-                       fprintf(stderr, "problem processing PERF_EVENT_MMAP, skipping event.\n");
-                       goto broken_event;
-               }
-               thread__insert_map(thread, map);
-               total_mmap++;
-               break;
-       }
-       case PERF_EVENT_COMM: {
-               struct thread *thread = threads__findnew(event->comm.pid);
-
-               if (dump_trace) {
-                       fprintf(stderr, "%p [%p]: PERF_EVENT_COMM: %s:%d\n",
-                               (void *)(offset + head),
-                               (void *)(long)(event->header.size),
-                               event->comm.comm, event->comm.pid);
-               }
-               if (thread == NULL ||
-                   thread__set_comm(thread, event->comm.comm)) {
-                       fprintf(stderr, "problem processing PERF_EVENT_COMM, skipping event.\n");
-                       goto broken_event;
-               }
-               total_comm++;
-               break;
-       }
-       default: {
-broken_event:
-               if (dump_trace)
-                       fprintf(stderr, "%p [%p]: skipping unknown header type: %d\n",
-                                       (void *)(offset + head),
-                                       (void *)(long)(event->header.size),
-                                       event->header.type);
+               dprintf("%p [%p]: skipping unknown header type: %d\n",
+                       (void *)(offset + head),
+                       (void *)(long)(event->header.size),
+                       event->header.type);
 
                total_unknown++;
 
@@ -766,7 +1013,6 @@ broken_event:
 
                size = 8;
        }
-       }
 
        head += size;
 
@@ -776,18 +1022,18 @@ broken_event:
        rc = EXIT_SUCCESS;
        close(input);
 
-       if (dump_trace) {
-               fprintf(stderr, "      IP events: %10ld\n", total);
-               fprintf(stderr, "    mmap events: %10ld\n", total_mmap);
-               fprintf(stderr, "    comm events: %10ld\n", total_comm);
-               fprintf(stderr, " unknown events: %10ld\n", total_unknown);
+       dprintf("      IP events: %10ld\n", total);
+       dprintf("    mmap events: %10ld\n", total_mmap);
+       dprintf("    comm events: %10ld\n", total_comm);
+       dprintf(" unknown events: %10ld\n", total_unknown);
 
+       if (dump_trace)
                return 0;
-       }
 
        if (verbose >= 2)
                dsos__fprintf(stdout);
 
+       collapse__resort();
        output__resort();
        output__fprintf(stdout, total);
 
@@ -809,9 +1055,26 @@ static const struct option options[] = {
        OPT_STRING('k', "vmlinux", &vmlinux, "file", "vmlinux pathname"),
        OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
                   "sort by key(s): pid, comm, dso, symbol. Default: pid,symbol"),
+       OPT_BOOLEAN('P', "full-paths", &full_paths,
+                   "Don't shorten the pathnames taking into account the cwd"),
        OPT_END()
 };
 
+static void setup_sorting(void)
+{
+       char *tmp, *tok, *str = strdup(sort_order);
+
+       for (tok = strtok_r(str, ", ", &tmp);
+                       tok; tok = strtok_r(NULL, ", ", &tmp)) {
+               if (sort_dimension__add(tok) < 0) {
+                       error("Unknown --sort key: `%s'", tok);
+                       usage_with_options(report_usage, options);
+               }
+       }
+
+       free(str);
+}
+
 int cmd_report(int argc, const char **argv, const char *prefix)
 {
        symbol__init();
This page took 0.037067 seconds and 5 git commands to generate.