perf report: Add consistent spacing rules
[deliverable/linux.git] / Documentation / perf_counter / builtin-report.c
index a634022bae079c7e6d75c01a4bfeccddaf307d9e..e930b4e02335d50a03dc8135064c02a7bbe55c4c 100644 (file)
@@ -1,13 +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 <libelf.h>
-#include <gelf.h>
-#include <elf.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;
@@ -41,6 +53,7 @@ struct ip_event {
        __u64 ip;
        __u32 pid, tid;
 };
+
 struct mmap_event {
        struct perf_event_header header;
        __u32 pid, tid;
@@ -49,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];
 };
 
@@ -62,305 +76,6 @@ typedef union event_union {
        struct comm_event comm;
 } event_t;
 
-struct symbol {
-       struct rb_node          rb_node;
-       __u64                   start;
-       __u64                   end;
-       char                    name[0];
-};
-
-static struct symbol *symbol__new(uint64_t start, uint64_t len, const char *name)
-{
-       struct symbol *self = malloc(sizeof(*self) + strlen(name) + 1);
-
-       if (self != NULL) {
-               self->start = start;
-               self->end   = start + len;
-               strcpy(self->name, name);
-       }
-
-       return self;
-}
-
-static void symbol__delete(struct symbol *self)
-{
-       free(self);
-}
-
-static size_t symbol__fprintf(struct symbol *self, FILE *fp)
-{
-       return fprintf(fp, " %llx-%llx %s\n",
-                      self->start, self->end, self->name);
-}
-
-struct dso {
-       struct list_head node;
-       struct rb_root   syms;
-       char             name[0];
-};
-
-static struct dso *dso__new(const char *name)
-{
-       struct dso *self = malloc(sizeof(*self) + strlen(name) + 1);
-
-       if (self != NULL) {
-               strcpy(self->name, name);
-               self->syms = RB_ROOT;
-       }
-
-       return self;
-}
-
-static void dso__delete_symbols(struct dso *self)
-{
-       struct symbol *pos;
-       struct rb_node *next = rb_first(&self->syms);
-
-       while (next) {
-               pos = rb_entry(next, struct symbol, rb_node);
-               next = rb_next(&pos->rb_node);
-               symbol__delete(pos);
-       }
-}
-
-static void dso__delete(struct dso *self)
-{
-       dso__delete_symbols(self);
-       free(self);
-}
-
-static void dso__insert_symbol(struct dso *self, struct symbol *sym)
-{
-       struct rb_node **p = &self->syms.rb_node;
-       struct rb_node *parent = NULL;
-       const uint64_t ip = sym->start;
-       struct symbol *s;
-
-       while (*p != NULL) {
-               parent = *p;
-               s = rb_entry(parent, struct symbol, rb_node);
-               if (ip < s->start)
-                       p = &(*p)->rb_left;
-               else
-                       p = &(*p)->rb_right;
-       }
-       rb_link_node(&sym->rb_node, parent, p);
-       rb_insert_color(&sym->rb_node, &self->syms);
-}
-
-static struct symbol *dso__find_symbol(struct dso *self, uint64_t ip)
-{
-       struct rb_node *n;
-
-       if (self == NULL)
-               return NULL;
-
-       n = self->syms.rb_node;
-
-       while (n) {
-               struct symbol *s = rb_entry(n, struct symbol, rb_node);
-
-               if (ip < s->start)
-                       n = n->rb_left;
-               else if (ip > s->end)
-                       n = n->rb_right;
-               else
-                       return s;
-       }
-
-       return NULL;
-}
-
-/**
- * elf_symtab__for_each_symbol - iterate thru all the symbols
- *
- * @self: struct elf_symtab instance to iterate
- * @index: uint32_t index
- * @sym: GElf_Sym iterator
- */
-#define elf_symtab__for_each_symbol(syms, nr_syms, index, sym) \
-       for (index = 0, gelf_getsym(syms, index, &sym);\
-            index < nr_syms; \
-            index++, gelf_getsym(syms, index, &sym))
-
-static inline uint8_t elf_sym__type(const GElf_Sym *sym)
-{
-       return GELF_ST_TYPE(sym->st_info);
-}
-
-static inline int elf_sym__is_function(const GElf_Sym *sym)
-{
-       return elf_sym__type(sym) == STT_FUNC &&
-              sym->st_name != 0 &&
-              sym->st_shndx != SHN_UNDEF &&
-              sym->st_size != 0;
-}
-
-static inline const char *elf_sym__name(const GElf_Sym *sym,
-                                       const Elf_Data *symstrs)
-{
-       return symstrs->d_buf + sym->st_name;
-}
-
-static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
-                                   GElf_Shdr *shp, const char *name,
-                                   size_t *index)
-{
-       Elf_Scn *sec = NULL;
-       size_t cnt = 1;
-
-       while ((sec = elf_nextscn(elf, sec)) != NULL) {
-               char *str;
-
-               gelf_getshdr(sec, shp);
-               str = elf_strptr(elf, ep->e_shstrndx, shp->sh_name);
-               if (!strcmp(name, str)) {
-                       if (index)
-                               *index = cnt;
-                       break;
-               }
-               ++cnt;
-       }
-
-       return sec;
-}
-
-static int dso__load_sym(struct dso *self, int fd, char *name)
-{
-       Elf_Data *symstrs;
-       uint32_t nr_syms;
-       int err = -1;
-       uint32_t index;
-       GElf_Ehdr ehdr;
-       GElf_Shdr shdr;
-       Elf_Data *syms;
-       GElf_Sym sym;
-       Elf_Scn *sec;
-       Elf *elf;
-       int nr = 0;
-
-       elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
-       if (elf == NULL) {
-               fprintf(stderr, "%s: cannot read %s ELF file.\n",
-                       __func__, name);
-               goto out_close;
-       }
-
-       if (gelf_getehdr(elf, &ehdr) == NULL) {
-               fprintf(stderr, "%s: cannot get elf header.\n", __func__);
-               goto out_elf_end;
-       }
-
-       sec = elf_section_by_name(elf, &ehdr, &shdr, ".symtab", NULL);
-       if (sec == NULL)
-               sec = elf_section_by_name(elf, &ehdr, &shdr, ".dynsym", NULL);
-
-       if (sec == NULL)
-               goto out_elf_end;
-
-       syms = elf_getdata(sec, NULL);
-       if (syms == NULL)
-               goto out_elf_end;
-
-       sec = elf_getscn(elf, shdr.sh_link);
-       if (sec == NULL)
-               goto out_elf_end;
-
-       symstrs = elf_getdata(sec, NULL);
-       if (symstrs == NULL)
-               goto out_elf_end;
-
-       nr_syms = shdr.sh_size / shdr.sh_entsize;
-
-       elf_symtab__for_each_symbol(syms, nr_syms, index, sym) {
-               struct symbol *f;
-
-               if (!elf_sym__is_function(&sym))
-                       continue;
-
-               sec = elf_getscn(elf, sym.st_shndx);
-               if (!sec)
-                       goto out_elf_end;
-
-               gelf_getshdr(sec, &shdr);
-               sym.st_value -= shdr.sh_addr - shdr.sh_offset;
-
-               f = symbol__new(sym.st_value, sym.st_size,
-                               elf_sym__name(&sym, symstrs));
-               if (!f)
-                       goto out_elf_end;
-
-               dso__insert_symbol(self, f);
-
-               nr++;
-       }
-
-       err = nr;
-out_elf_end:
-       elf_end(elf);
-out_close:
-       return err;
-}
-
-static int dso__load(struct dso *self)
-{
-       int size = strlen(self->name) + sizeof("/usr/lib/debug%s.debug");
-       char *name = malloc(size);
-       int variant = 0;
-       int ret = -1;
-       int fd;
-
-       if (!name)
-               return -1;
-
-more:
-       do {
-               switch (variant) {
-               case 0: /* Fedora */
-                       snprintf(name, size, "/usr/lib/debug%s.debug", self->name);
-                       break;
-               case 1: /* Ubuntu */
-                       snprintf(name, size, "/usr/lib/debug%s", self->name);
-                       break;
-               case 2: /* Sane people */
-                       snprintf(name, size, "%s", self->name);
-                       break;
-
-               default:
-                       goto out;
-               }
-               variant++;
-
-               fd = open(name, O_RDONLY);
-       } while (fd < 0);
-
-       ret = dso__load_sym(self, fd, name);
-       close(fd);
-
-       /*
-        * Some people seem to have debuginfo files _WITHOUT_ debug info!?!?
-        */
-       if (!ret)
-               goto more;
-
-out:
-       free(name);
-       return ret;
-}
-
-static size_t dso__fprintf(struct dso *self, FILE *fp)
-{
-       size_t ret = fprintf(fp, "dso: %s\n", self->name);
-
-       struct rb_node *nd;
-       for (nd = rb_first(&self->syms); nd; nd = rb_next(nd)) {
-               struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
-               ret += symbol__fprintf(pos, fp);
-       }
-
-       return ret;
-}
-
 static LIST_HEAD(dsos);
 static struct dso *kernel_dso;
 
@@ -384,25 +99,27 @@ static struct dso *dsos__findnew(const char *name)
        struct dso *dso = dsos__find(name);
        int nr;
 
-       if (dso == NULL) {
-               dso = dso__new(name);
-               if (!dso)
-                       goto out_delete_dso;
+       if (dso)
+               return dso;
 
-               nr = dso__load(dso);
-               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;
 
 out_delete_dso:
@@ -418,153 +135,36 @@ static void dsos__fprintf(FILE *fp)
                dso__fprintf(pos, fp);
 }
 
-static int hex(char ch)
-{
-       if ((ch >= '0') && (ch <= '9'))
-               return ch - '0';
-       if ((ch >= 'a') && (ch <= 'f'))
-               return ch - 'a' + 10;
-       if ((ch >= 'A') && (ch <= 'F'))
-               return ch - 'A' + 10;
-       return -1;
-}
-
-/*
- * While we find nice hex chars, build a long_val.
- * Return number of chars processed.
- */
-static int hex2long(char *ptr, unsigned long *long_val)
-{
-       const char *p = ptr;
-       *long_val = 0;
-
-       while (*p) {
-               const int hex_val = hex(*p);
-
-               if (hex_val < 0)
-                       break;
-
-               *long_val = (*long_val << 4) | hex_val;
-               p++;
-       }
-
-       return p - ptr;
-}
-
-static int load_kallsyms(void)
+static int load_kernel(void)
 {
-       struct rb_node *nd, *prevnd;
-       char *line = NULL;
-       FILE *file;
-       size_t n;
+       int err;
 
-       kernel_dso = dso__new("[kernel]");
-       if (kernel_dso == NULL)
+       kernel_dso = dso__new("[kernel]", 0);
+       if (!kernel_dso)
                return -1;
 
-       file = fopen("/proc/kallsyms", "r");
-       if (file == NULL)
-               goto out_delete_dso;
-
-       while (!feof(file)) {
-               unsigned long start;
-               struct symbol *sym;
-               int line_len, len;
-               char symbol_type;
-
-               line_len = getline(&line, &n, file);
-               if (line_len < 0)
-                       break;
-
-               if (!line)
-                       goto out_delete_dso;
-
-               line[--line_len] = '\0'; /* \n */
-
-               len = hex2long(line, &start);
-
-               len++;
-               if (len + 2 >= line_len)
-                       continue;
-
-               symbol_type = toupper(line[len]);
-               /*
-                * We're interested only in code ('T'ext)
-                */
-               if (symbol_type != 'T' && symbol_type != 'W')
-                       continue;
-               /*
-                * Well fix up the end later, when we have all sorted.
-                */
-               sym = symbol__new(start, 0xdead, line + len + 2);
-
-               if (sym == NULL)
-                       goto out_delete_dso;
-
-               dso__insert_symbol(kernel_dso, sym);
-       }
-
-       /*
-        * Now that we have all sorted out, just set the ->end of all
-        * symbols
-        */
-       prevnd = rb_first(&kernel_dso->syms);
-
-       if (prevnd == NULL)
-               goto out_delete_line;
-
-       for (nd = rb_next(prevnd); nd; nd = rb_next(nd)) {
-               struct symbol *prev = rb_entry(prevnd, struct symbol, rb_node),
-                             *curr = rb_entry(nd, struct symbol, rb_node);
-
-               prev->end = curr->start - 1;
-               prevnd = nd;
-       }
-
-       dsos__add(kernel_dso);
-       free(line);
-       fclose(file);
-
-       return 0;
+       err = dso__load_kernel(kernel_dso, vmlinux, NULL, verbose);
+       if (err) {
+               dso__delete(kernel_dso);
+               kernel_dso = NULL;
+       } else
+               dsos__add(kernel_dso);
 
-out_delete_line:
-       free(line);
-out_delete_dso:
-       dso__delete(kernel_dso);
-       return -1;
+       return err;
 }
 
-static int load_kernel(void)
-{
-       int fd, nr;
-
-       if (!vmlinux)
-               goto kallsyms;
-
-       fd = open(vmlinux, O_RDONLY);
-       if (fd < 0)
-               goto kallsyms;
-
-       kernel_dso = dso__new("[kernel]");
-       if (!kernel_dso)
-               goto fail_open;
-
-       nr = dso__load_sym(kernel_dso, fd, vmlinux);
+static char __cwd[PATH_MAX];
+static char *cwd = __cwd;
+static int cwdlen;
 
-       if (nr <= 0)
-               goto fail_load;
-
-       dsos__add(kernel_dso);
-       close(fd);
+static int strcommon(const char *pathname)
+{
+       int n = 0;
 
-       return 0;
+       while (pathname[n] == cwd[n] && n < cwdlen)
+               ++n;
 
-fail_load:
-       dso__delete(kernel_dso);
-fail_open:
-       close(fd);
-kallsyms:
-       return load_kallsyms();
+       return n;
 }
 
 struct map {
@@ -580,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;
        }
@@ -596,8 +209,6 @@ out_delete:
 
 struct thread;
 
-static const char *thread__name(struct thread *self, char *bf, size_t size);
-
 struct thread {
        struct rb_node   rb_node;
        struct list_head maps;
@@ -605,22 +216,15 @@ struct thread {
        char             *comm;
 };
 
-static const char *thread__name(struct thread *self, char *bf, size_t size)
-{
-       if (self->comm)
-               return self->comm;
-
-       snprintf(bf, sizeof(bf), ":%u", self->pid);
-       return bf;
-}
-
 static struct thread *thread__new(pid_t pid)
 {
        struct thread *self = malloc(sizeof(*self));
 
        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);
        }
 
@@ -629,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)
 {
@@ -641,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;
@@ -658,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;
 }
 
@@ -707,10 +326,15 @@ struct hist_entry {
 struct sort_entry {
        struct list_head list;
 
+       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)
 {
@@ -720,19 +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)
 {
-       char bf[32];
-
-       return fprintf(fp, "%14s ",
-                       thread__name(self->thread, bf, sizeof(bf)));
+       return fprintf(fp, "%16s:%5d", self->thread->comm ?: "", self->thread->pid);
 }
 
 static struct sort_entry sort_thread = {
+       .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;
@@ -752,14 +382,53 @@ 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, "%20s ", self->thread->comm ?: "<unknown>");
+       return fprintf(fp, "%16s", self->thread->comm);
 }
 
 static struct sort_entry sort_comm = {
-       .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)
+{
+       struct dso *dso_l = left->dso;
+       struct dso *dso_r = right->dso;
+
+       if (!dso_l || !dso_r) {
+               if (!dso_l && !dso_r)
+                       return 0;
+               else if (!dso_l)
+                       return -1;
+               else
+                       return 1;
+       }
+
+       return strcmp(dso_l->name, dso_r->name);
+}
+
+static size_t
+sort__dso_print(FILE *fp, struct hist_entry *self)
+{
+       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            ",
+       .cmp    = sort__dso_cmp,
+       .print  = sort__dso_print,
+};
+
+/* --sort symbol */
+
 static int64_t
 sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
 {
@@ -779,27 +448,25 @@ sort__sym_print(FILE *fp, struct hist_entry *self)
 {
        size_t ret = 0;
 
-       ret += fprintf(fp, "[%c] ", self->level);
-
        if (verbose)
-               ret += fprintf(fp, "%#018llx ", (unsigned long long)self->ip);
+               ret += fprintf(fp, "%#018llx  ", (__u64)self->ip);
 
-       if (self->level != '.')
-               ret += fprintf(fp, "%s ",
-                              self->sym ? self->sym->name : "<unknown>");
+       if (self->sym)
+               ret += fprintf(fp, "%s", self->sym->name);
        else
-               ret += fprintf(fp, "%s: %s ",
-                              self->dso ? self->dso->name : "<unknown>",
-                              self->sym ? self->sym->name : "<unknown>");
+               ret += fprintf(fp, "%#016llx", (__u64)self->ip);
 
        return ret;
 }
 
 static struct sort_entry sort_sym = {
+       .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;
@@ -809,6 +476,7 @@ struct sort_dimension {
 static struct sort_dimension sort_dimensions[] = {
        { .name = "pid",        .entry = &sort_thread,  },
        { .name = "comm",       .entry = &sort_comm,    },
+       { .name = "dso",        .entry = &sort_dso,     },
        { .name = "symbol",     .entry = &sort_sym,     },
 };
 
@@ -824,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;
        }
@@ -868,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");
 
@@ -930,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.
  */
@@ -958,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);
        }
 }
@@ -973,28 +719,219 @@ static void output__resort(void)
 static size_t output__fprintf(FILE *fp, uint64_t total_samples)
 {
        struct hist_entry *pos;
+       struct sort_entry *se;
        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, "\n");
+
+       fprintf(fp, "# ........");
+       list_for_each_entry(se, &hist_entry__sort_list, list) {
+               int i;
+
+               fprintf(fp, "  ");
+               for (i = 0; i < strlen(se->header); i++)
+                       fprintf(fp, ".");
+       }
+       fprintf(fp, "\n");
+
+       fprintf(fp, "#\n");
+
        for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) {
                pos = rb_entry(nd, struct hist_entry, rb_node);
                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) {
@@ -1014,10 +951,20 @@ static int __cmd_report(void)
        }
 
        if (load_kernel() < 0) {
-               perror("failed to open kallsyms");
+               perror("failed to load kernel symbols");
                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);
@@ -1046,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, bailing out\n",
-                               event->header.type);
-                       goto done;
-               }
 
-               if (event->header.misc & PERF_EVENT_MISC_KERNEL) {
-                       show = SHOW_KERNEL;
-                       level = 'k';
+       if (!size || process_event(event, offset, head) < 0) {
 
-                       dso = kernel_dso;
-
-               } 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, bailing out\n");
-                               goto done;
-                       }
-               }
-               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, bailing out\n");
-                       goto done;
-               }
-               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, bailing out\n");
-                       goto done;
-               }
-               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++;
 
@@ -1163,7 +1013,6 @@ broken_event:
 
                size = 8;
        }
-       }
 
        head += size;
 
@@ -1171,21 +1020,20 @@ broken_event:
                goto more;
 
        rc = EXIT_SUCCESS;
-done:
        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);
 
@@ -1205,13 +1053,31 @@ static const struct option options[] = {
        OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
                    "dump raw trace in ASCII"),
        OPT_STRING('k', "vmlinux", &vmlinux, "file", "vmlinux pathname"),
-       OPT_STRING('s', "sort", &sort_order, "foo", "bar"),
+       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)
 {
-       elf_version(EV_CURRENT);
+       symbol__init();
 
        page_size = getpagesize();
 
This page took 0.039396 seconds and 5 git commands to generate.