perf report: Add a simple GTK2-based 'perf report' browser
[linux-flexiantxendom0-3.2.10.git] / tools / perf / builtin-report.c
index d609afb..2e31743 100644 (file)
@@ -9,20 +9,23 @@
 
 #include "util/util.h"
 
+#include "util/annotate.h"
 #include "util/color.h"
 #include <linux/list.h>
 #include "util/cache.h"
 #include <linux/rbtree.h>
 #include "util/symbol.h"
-#include "util/string.h"
 #include "util/callchain.h"
 #include "util/strlist.h"
 #include "util/values.h"
 
 #include "perf.h"
 #include "util/debug.h"
+#include "util/evlist.h"
+#include "util/evsel.h"
 #include "util/header.h"
 #include "util/session.h"
+#include "util/tool.h"
 
 #include "util/parse-options.h"
 #include "util/parse-events.h"
 #include "util/sort.h"
 #include "util/hist.h"
 
-static char            const *input_name = "perf.data";
-
-static int             force;
-static bool            hide_unresolved;
-static bool            dont_use_callchains;
-
-static int             show_threads;
-static struct perf_read_values show_threads_values;
-
-static char            default_pretty_printing_style[] = "normal";
-static char            *pretty_printing_style = default_pretty_printing_style;
-
-static char            callchain_default_opt[] = "fractal,0.5";
+#include <linux/bitmap.h>
+
+struct perf_report {
+       struct perf_tool        tool;
+       struct perf_session     *session;
+       char const              *input_name;
+       bool                    force, use_tui, use_gtk, use_stdio;
+       bool                    hide_unresolved;
+       bool                    dont_use_callchains;
+       bool                    show_full_info;
+       bool                    show_threads;
+       bool                    inverted_callchain;
+       struct perf_read_values show_threads_values;
+       const char              *pretty_printing_style;
+       symbol_filter_t         annotate_init;
+       const char              *cpu_list;
+       const char              *symbol_filter_str;
+       DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
+};
 
-static struct event_stat_id *get_stats(struct perf_session *self,
-                                      u64 event_stream, u32 type, u64 config)
+static int perf_report__add_branch_hist_entry(struct perf_tool *tool,
+                                       struct addr_location *al,
+                                       struct perf_sample *sample,
+                                       struct perf_evsel *evsel,
+                                     struct machine *machine)
 {
-       struct rb_node **p = &self->stats_by_id.rb_node;
-       struct rb_node *parent = NULL;
-       struct event_stat_id *iter, *new;
+       struct perf_report *rep = container_of(tool, struct perf_report, tool);
+       struct symbol *parent = NULL;
+       int err = 0;
+       unsigned i;
+       struct hist_entry *he;
+       struct branch_info *bi, *bx;
+
+       if ((sort__has_parent || symbol_conf.use_callchain)
+           && sample->callchain) {
+               err = machine__resolve_callchain(machine, evsel, al->thread,
+                                                sample->callchain, &parent);
+               if (err)
+                       return err;
+       }
 
-       while (*p != NULL) {
-               parent = *p;
-               iter = rb_entry(parent, struct event_stat_id, rb_node);
-               if (iter->config == config)
-                       return iter;
+       bi = machine__resolve_bstack(machine, al->thread,
+                                    sample->branch_stack);
+       if (!bi)
+               return -ENOMEM;
 
+       for (i = 0; i < sample->branch_stack->nr; i++) {
+               if (rep->hide_unresolved && !(bi[i].from.sym && bi[i].to.sym))
+                       continue;
+               /*
+                * The report shows the percentage of total branches captured
+                * and not events sampled. Thus we use a pseudo period of 1.
+                */
+               he = __hists__add_branch_entry(&evsel->hists, al, parent,
+                               &bi[i], 1);
+               if (he) {
+                       struct annotation *notes;
+                       err = -ENOMEM;
+                       bx = he->branch_info;
+                       if (bx->from.sym && use_browser > 0) {
+                               notes = symbol__annotation(bx->from.sym);
+                               if (!notes->src
+                                   && symbol__alloc_hist(bx->from.sym) < 0)
+                                       goto out;
+
+                               err = symbol__inc_addr_samples(bx->from.sym,
+                                                              bx->from.map,
+                                                              evsel->idx,
+                                                              bx->from.al_addr);
+                               if (err)
+                                       goto out;
+                       }
 
-               if (config > iter->config)
-                       p = &(*p)->rb_right;
-               else
-                       p = &(*p)->rb_left;
+                       if (bx->to.sym && use_browser > 0) {
+                               notes = symbol__annotation(bx->to.sym);
+                               if (!notes->src
+                                   && symbol__alloc_hist(bx->to.sym) < 0)
+                                       goto out;
+
+                               err = symbol__inc_addr_samples(bx->to.sym,
+                                                              bx->to.map,
+                                                              evsel->idx,
+                                                              bx->to.al_addr);
+                               if (err)
+                                       goto out;
+                       }
+                       evsel->hists.stats.total_period += 1;
+                       hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
+                       err = 0;
+               } else
+                       return -ENOMEM;
        }
-
-       new = malloc(sizeof(struct event_stat_id));
-       if (new == NULL)
-               return NULL;
-       memset(new, 0, sizeof(struct event_stat_id));
-       new->event_stream = event_stream;
-       new->config = config;
-       new->type = type;
-       rb_link_node(&new->rb_node, parent, p);
-       rb_insert_color(&new->rb_node, &self->stats_by_id);
-       return new;
+out:
+       return err;
 }
 
-static int perf_session__add_hist_entry(struct perf_session *self,
-                                       struct addr_location *al,
-                                       struct sample_data *data)
+static int perf_evsel__add_hist_entry(struct perf_evsel *evsel,
+                                     struct addr_location *al,
+                                     struct perf_sample *sample,
+                                     struct machine *machine)
 {
-       struct symbol **syms = NULL, *parent = NULL;
-       bool hit;
-       int err;
+       struct symbol *parent = NULL;
+       int err = 0;
        struct hist_entry *he;
-       struct event_stat_id *stats;
-       struct perf_event_attr *attr;
 
-       if ((sort__has_parent || symbol_conf.use_callchain) && data->callchain)
-               syms = perf_session__resolve_callchain(self, al->thread,
-                                                      data->callchain, &parent);
+       if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
+               err = machine__resolve_callchain(machine, evsel, al->thread,
+                                                sample->callchain, &parent);
+               if (err)
+                       return err;
+       }
 
-       attr = perf_header__find_attr(data->id, &self->header);
-       if (attr)
-               stats = get_stats(self, data->id, attr->type, attr->config);
-       else
-               stats = get_stats(self, data->id, 0, 0);
-       if (stats == NULL)
-               return -ENOMEM;
-       he = __perf_session__add_hist_entry(&stats->hists, al, parent,
-                                           data->period, &hit);
+       he = __hists__add_entry(&evsel->hists, al, parent, sample->period);
        if (he == NULL)
                return -ENOMEM;
 
-       if (hit)
-               he->count += data->period;
-
        if (symbol_conf.use_callchain) {
-               if (!hit)
-                       callchain_init(&he->callchain);
-               err = append_chain(&he->callchain, data->callchain, syms);
-               free(syms);
-
+               err = callchain_append(he->callchain,
+                                      &evsel->hists.callchain_cursor,
+                                      sample->period);
                if (err)
                        return err;
        }
+       /*
+        * Only in the newt browser we are doing integrated annotation,
+        * so we don't allocated the extra space needed because the stdio
+        * code will not use it.
+        */
+       if (al->sym != NULL && use_browser > 0) {
+               struct annotation *notes = symbol__annotation(he->ms.sym);
 
-       return 0;
-}
-
-static int validate_chain(struct ip_callchain *chain, event_t *event)
-{
-       unsigned int chain_size;
+               assert(evsel != NULL);
 
-       chain_size = event->header.size;
-       chain_size -= (unsigned long)&event->ip.__more_data - (unsigned long)event;
+               err = -ENOMEM;
+               if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)
+                       goto out;
 
-       if (chain->nr*sizeof(u64) > chain_size)
-               return -1;
+               err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
+       }
 
-       return 0;
+       evsel->hists.stats.total_period += sample->period;
+       hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
+out:
+       return err;
 }
 
-static int add_event_total(struct perf_session *session,
-                          struct sample_data *data,
-                          struct perf_event_attr *attr)
-{
-       struct event_stat_id *stats;
-
-       if (attr)
-               stats = get_stats(session, data->id, attr->type, attr->config);
-       else
-               stats = get_stats(session, data->id, 0, 0);
-
-       if (!stats)
-               return -ENOMEM;
-
-       stats->stats.total += data->period;
-       session->events_stats.total += data->period;
-       return 0;
-}
 
-static int process_sample_event(event_t *event, struct perf_session *session)
+static int process_sample_event(struct perf_tool *tool,
+                               union perf_event *event,
+                               struct perf_sample *sample,
+                               struct perf_evsel *evsel,
+                               struct machine *machine)
 {
-       struct sample_data data = { .period = 1, };
+       struct perf_report *rep = container_of(tool, struct perf_report, tool);
        struct addr_location al;
-       struct perf_event_attr *attr;
-
-       event__parse_sample(event, session->sample_type, &data);
-
-       dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
-                   data.pid, data.tid, data.ip, data.period);
-
-       if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {
-               unsigned int i;
-
-               dump_printf("... chain: nr:%Lu\n", data.callchain->nr);
-
-               if (validate_chain(data.callchain, event) < 0) {
-                       pr_debug("call-chain problem with event, "
-                                "skipping it.\n");
-                       return 0;
-               }
-
-               if (dump_trace) {
-                       for (i = 0; i < data.callchain->nr; i++)
-                               dump_printf("..... %2d: %016Lx\n",
-                                           i, data.callchain->ips[i]);
-               }
-       }
 
-       if (event__preprocess_sample(event, session, &al, NULL) < 0) {
+       if (perf_event__preprocess_sample(event, machine, &al, sample,
+                                         rep->annotate_init) < 0) {
                fprintf(stderr, "problem processing %d event, skipping it.\n",
                        event->header.type);
                return -1;
        }
 
-       if (al.filtered || (hide_unresolved && al.sym == NULL))
+       if (al.filtered || (rep->hide_unresolved && al.sym == NULL))
                return 0;
 
-       if (perf_session__add_hist_entry(session, &al, &data)) {
-               pr_debug("problem incrementing symbol count, skipping event\n");
-               return -1;
-       }
+       if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap))
+               return 0;
 
-       attr = perf_header__find_attr(data.id, &session->header);
+       if (sort__branch_mode == 1) {
+               if (perf_report__add_branch_hist_entry(tool, &al, sample,
+                                                      evsel, machine)) {
+                       pr_debug("problem adding lbr entry, skipping event\n");
+                       return -1;
+               }
+       } else {
+               if (al.map != NULL)
+                       al.map->dso->hit = 1;
 
-       if (add_event_total(session, &data, attr)) {
-               pr_debug("problem adding event count\n");
-               return -1;
+               if (perf_evsel__add_hist_entry(evsel, &al, sample, machine)) {
+                       pr_debug("problem incrementing symbol period, skipping event\n");
+                       return -1;
+               }
        }
-
        return 0;
 }
 
-static int process_read_event(event_t *event, struct perf_session *session __used)
+static int process_read_event(struct perf_tool *tool,
+                             union perf_event *event,
+                             struct perf_sample *sample __used,
+                             struct perf_evsel *evsel,
+                             struct machine *machine __used)
 {
-       struct perf_event_attr *attr;
+       struct perf_report *rep = container_of(tool, struct perf_report, tool);
 
-       attr = perf_header__find_attr(event->read.id, &session->header);
-
-       if (show_threads) {
-               const char *name = attr ? __event_name(attr->type, attr->config)
-                                  : "unknown";
-               perf_read_values_add_value(&show_threads_values,
+       if (rep->show_threads) {
+               const char *name = evsel ? event_name(evsel) : "unknown";
+               perf_read_values_add_value(&rep->show_threads_values,
                                           event->read.pid, event->read.tid,
                                           event->read.id,
                                           name,
                                           event->read.value);
        }
 
-       dump_printf(": %d %d %s %Lu\n", event->read.pid, event->read.tid,
-                   attr ? __event_name(attr->type, attr->config) : "FAIL",
+       dump_printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid,
+                   evsel ? event_name(evsel) : "FAIL",
                    event->read.value);
 
        return 0;
 }
 
-static int perf_session__setup_sample_type(struct perf_session *self)
+static int perf_report__setup_sample_type(struct perf_report *rep)
 {
+       struct perf_session *self = rep->session;
+
        if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
                if (sort__has_parent) {
-                       fprintf(stderr, "selected --sort parent, but no"
-                                       " callchain data. Did you call"
-                                       " perf record without -g?\n");
+                       ui__warning("Selected --sort parent, but no "
+                                   "callchain data. Did you call "
+                                   "'perf record' without -g?\n");
                        return -EINVAL;
                }
                if (symbol_conf.use_callchain) {
-                       fprintf(stderr, "selected -g but no callchain data."
-                                       " Did you call perf record without"
-                                       " -g?\n");
+                       ui__warning("Selected -g but no callchain data. Did "
+                                   "you call 'perf record' without -g?\n");
                        return -1;
                }
-       } else if (!dont_use_callchains && callchain_param.mode != CHAIN_NONE &&
+       } else if (!rep->dont_use_callchains &&
+                  callchain_param.mode != CHAIN_NONE &&
                   !symbol_conf.use_callchain) {
                        symbol_conf.use_callchain = true;
-                       if (register_callchain_param(&callchain_param) < 0) {
-                               fprintf(stderr, "Can't register callchain"
-                                               " params\n");
+                       if (callchain_register_param(&callchain_param) < 0) {
+                               ui__warning("Can't register callchain "
+                                           "params.\n");
                                return -EINVAL;
                        }
        }
 
+       if (sort__branch_mode == 1) {
+               if (!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) {
+                       fprintf(stderr, "selected -b but no branch data."
+                                       " Did you call perf record without"
+                                       " -b?\n");
+                       return -1;
+               }
+       }
+
        return 0;
 }
 
-static struct perf_event_ops event_ops = {
-       .sample = process_sample_event,
-       .mmap   = event__process_mmap,
-       .comm   = event__process_comm,
-       .exit   = event__process_task,
-       .fork   = event__process_task,
-       .lost   = event__process_lost,
-       .read   = process_read_event,
-};
+extern volatile int session_done;
+
+static void sig_handler(int sig __used)
+{
+       session_done = 1;
+}
+
+static size_t hists__fprintf_nr_sample_events(struct hists *self,
+                                             const char *evname, FILE *fp)
+{
+       size_t ret;
+       char unit;
+       unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
+
+       nr_events = convert_unit(nr_events, &unit);
+       ret = fprintf(fp, "# Events: %lu%c", nr_events, unit);
+       if (evname != NULL)
+               ret += fprintf(fp, " %s", evname);
+       return ret + fprintf(fp, "\n#\n");
+}
+
+static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
+                                        struct perf_report *rep,
+                                        const char *help)
+{
+       struct perf_evsel *pos;
+
+       list_for_each_entry(pos, &evlist->entries, node) {
+               struct hists *hists = &pos->hists;
+               const char *evname = event_name(pos);
+
+               hists__fprintf_nr_sample_events(hists, evname, stdout);
+               hists__fprintf(hists, NULL, false, true, 0, 0, stdout);
+               fprintf(stdout, "\n\n");
+       }
+
+       if (sort_order == default_sort_order &&
+           parent_pattern == default_parent_pattern) {
+               fprintf(stdout, "#\n# (%s)\n#\n", help);
+
+               if (rep->show_threads) {
+                       bool style = !strcmp(rep->pretty_printing_style, "raw");
+                       perf_read_values_display(stdout, &rep->show_threads_values,
+                                                style);
+                       perf_read_values_destroy(&rep->show_threads_values);
+               }
+       }
+
+       return 0;
+}
 
-static int __cmd_report(void)
+static int __cmd_report(struct perf_report *rep)
 {
        int ret = -EINVAL;
-       struct perf_session *session;
-       struct rb_node *next;
+       u64 nr_samples;
+       struct perf_session *session = rep->session;
+       struct perf_evsel *pos;
+       struct map *kernel_map;
+       struct kmap *kernel_kmap;
        const char *help = "For a higher level overview, try: perf report --sort comm,dso";
 
-       session = perf_session__new(input_name, O_RDONLY, force);
-       if (session == NULL)
-               return -ENOMEM;
+       signal(SIGINT, sig_handler);
+
+       if (rep->cpu_list) {
+               ret = perf_session__cpu_bitmap(session, rep->cpu_list,
+                                              rep->cpu_bitmap);
+               if (ret)
+                       goto out_delete;
+       }
+
+       if (use_browser <= 0)
+               perf_session__fprintf_info(session, stdout, rep->show_full_info);
 
-       if (show_threads)
-               perf_read_values_init(&show_threads_values);
+       if (rep->show_threads)
+               perf_read_values_init(&rep->show_threads_values);
 
-       ret = perf_session__setup_sample_type(session);
+       ret = perf_report__setup_sample_type(rep);
        if (ret)
                goto out_delete;
 
-       ret = perf_session__process_events(session, &event_ops);
+       ret = perf_session__process_events(session, &rep->tool);
        if (ret)
                goto out_delete;
 
+       kernel_map = session->host_machine.vmlinux_maps[MAP__FUNCTION];
+       kernel_kmap = map__kmap(kernel_map);
+       if (kernel_map == NULL ||
+           (kernel_map->dso->hit &&
+            (kernel_kmap->ref_reloc_sym == NULL ||
+             kernel_kmap->ref_reloc_sym->addr == 0))) {
+               const struct dso *kdso = kernel_map->dso;
+
+               ui__warning(
+"Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
+"Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
+"Samples in kernel modules can't be resolved as well.\n\n",
+                           RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION]) ?
+"As no suitable kallsyms nor vmlinux was found, kernel samples\n"
+"can't be resolved." :
+"If some relocation was applied (e.g. kexec) symbols may be misresolved.");
+       }
+
        if (dump_trace) {
-               event__print_totals();
+               perf_session__fprintf_nr_events(session, stdout);
                goto out_delete;
        }
 
@@ -297,65 +395,64 @@ static int __cmd_report(void)
                perf_session__fprintf(session, stdout);
 
        if (verbose > 2)
-               dsos__fprintf(stdout);
-
-       next = rb_first(&session->stats_by_id);
-       while (next) {
-               struct event_stat_id *stats;
-
-               stats = rb_entry(next, struct event_stat_id, rb_node);
-               perf_session__collapse_resort(&stats->hists);
-               perf_session__output_resort(&stats->hists, stats->stats.total);
-
-               if (use_browser)
-                       perf_session__browse_hists(&stats->hists,
-                                                  stats->stats.total, help);
-               else {
-                       if (rb_first(&session->stats_by_id) ==
-                           rb_last(&session->stats_by_id))
-                               fprintf(stdout, "# Samples: %Ld\n#\n",
-                                       stats->stats.total);
-                       else
-                               fprintf(stdout, "# Samples: %Ld %s\n#\n",
-                                       stats->stats.total,
-                                       __event_name(stats->type, stats->config));
-
-                       perf_session__fprintf_hists(&stats->hists, NULL, false, stdout,
-                                           stats->stats.total);
-                       fprintf(stdout, "\n\n");
-               }
+               perf_session__fprintf_dsos(session, stdout);
 
-               next = rb_next(&stats->rb_node);
+       nr_samples = 0;
+       list_for_each_entry(pos, &session->evlist->entries, node) {
+               struct hists *hists = &pos->hists;
+
+               if (pos->idx == 0)
+                       hists->symbol_filter_str = rep->symbol_filter_str;
+
+               hists__collapse_resort(hists);
+               hists__output_resort(hists);
+               nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE];
        }
 
-       if (!use_browser && sort_order == default_sort_order &&
-           parent_pattern == default_parent_pattern) {
-               fprintf(stdout, "#\n# (%s)\n#\n", help);
+       if (nr_samples == 0) {
+               ui__warning("The %s file has no samples!\n", session->filename);
+               goto out_delete;
+       }
 
-               if (show_threads) {
-                       bool style = !strcmp(pretty_printing_style, "raw");
-                       perf_read_values_display(stdout, &show_threads_values,
-                                                style);
-                       perf_read_values_destroy(&show_threads_values);
+       if (use_browser > 0) {
+               if (use_browser == 1) {
+                       perf_evlist__tui_browse_hists(session->evlist, help,
+                                                     NULL, NULL, 0);
+               } else if (use_browser == 2) {
+                       perf_evlist__gtk_browse_hists(session->evlist, help,
+                                                     NULL, NULL, 0);
                }
-       }
+       } else
+               perf_evlist__tty_browse_hists(session->evlist, rep, help);
+
 out_delete:
-       perf_session__delete(session);
+       /*
+        * Speed up the exit process, for large files this can
+        * take quite a while.
+        *
+        * XXX Enable this when using valgrind or if we ever
+        * librarize this command.
+        *
+        * Also experiment with obstacks to see how much speed
+        * up we'll get here.
+        *
+        * perf_session__delete(session);
+        */
        return ret;
 }
 
 static int
-parse_callchain_opt(const struct option *opt __used, const char *arg,
-                   int unset)
+parse_callchain_opt(const struct option *opt, const char *arg, int unset)
 {
-       char *tok;
+       struct perf_report *rep = (struct perf_report *)opt->value;
+       char *tok, *tok2;
        char *endptr;
 
        /*
         * --no-call-graph
         */
        if (unset) {
-               dont_use_callchains = true;
+               rep->dont_use_callchains = true;
                return 0;
        }
 
@@ -397,91 +494,263 @@ parse_callchain_opt(const struct option *opt __used, const char *arg,
        if (tok == endptr)
                return -1;
 
+       /* get the print limit */
+       tok2 = strtok(NULL, ",");
+       if (!tok2)
+               goto setup;
+
+       if (tok2[0] != 'c') {
+               callchain_param.print_limit = strtoul(tok2, &endptr, 0);
+               tok2 = strtok(NULL, ",");
+               if (!tok2)
+                       goto setup;
+       }
+
+       /* get the call chain order */
+       if (!strcmp(tok2, "caller"))
+               callchain_param.order = ORDER_CALLER;
+       else if (!strcmp(tok2, "callee"))
+               callchain_param.order = ORDER_CALLEE;
+       else
+               return -1;
 setup:
-       if (register_callchain_param(&callchain_param) < 0) {
+       if (callchain_register_param(&callchain_param) < 0) {
                fprintf(stderr, "Can't register callchain params\n");
                return -1;
        }
        return 0;
 }
 
-static const char * const report_usage[] = {
-       "perf report [<options>] <command>",
-       NULL
-};
+static int
+parse_branch_mode(const struct option *opt __used, const char *str __used, int unset)
+{
+       sort__branch_mode = !unset;
+       return 0;
+}
 
-static const struct option options[] = {
-       OPT_STRING('i', "input", &input_name, "file",
+int cmd_report(int argc, const char **argv, const char *prefix __used)
+{
+       struct perf_session *session;
+       struct stat st;
+       bool has_br_stack = false;
+       int ret = -1;
+       char callchain_default_opt[] = "fractal,0.5,callee";
+       const char * const report_usage[] = {
+               "perf report [<options>]",
+               NULL
+       };
+       struct perf_report report = {
+               .tool = {
+                       .sample          = process_sample_event,
+                       .mmap            = perf_event__process_mmap,
+                       .comm            = perf_event__process_comm,
+                       .exit            = perf_event__process_task,
+                       .fork            = perf_event__process_task,
+                       .lost            = perf_event__process_lost,
+                       .read            = process_read_event,
+                       .attr            = perf_event__process_attr,
+                       .event_type      = perf_event__process_event_type,
+                       .tracing_data    = perf_event__process_tracing_data,
+                       .build_id        = perf_event__process_build_id,
+                       .ordered_samples = true,
+                       .ordering_requires_timestamps = true,
+               },
+               .pretty_printing_style   = "normal",
+       };
+       const struct option options[] = {
+       OPT_STRING('i', "input", &report.input_name, "file",
                    "input file name"),
-       OPT_BOOLEAN('v', "verbose", &verbose,
+       OPT_INCR('v', "verbose", &verbose,
                    "be more verbose (show symbol address, etc)"),
        OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
                    "dump raw trace in ASCII"),
        OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                   "file", "vmlinux pathname"),
-       OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
+       OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
+                  "file", "kallsyms pathname"),
+       OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"),
        OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
                    "load module symbols - WARNING: use only with -k and LIVE kernel"),
        OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
                    "Show a column with the number of samples"),
-       OPT_BOOLEAN('T', "threads", &show_threads,
+       OPT_BOOLEAN('T', "threads", &report.show_threads,
                    "Show per-thread event counters"),
-       OPT_STRING(0, "pretty", &pretty_printing_style, "key",
+       OPT_STRING(0, "pretty", &report.pretty_printing_style, "key",
                   "pretty printing style key: normal raw"),
+       OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"),
+       OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"),
+       OPT_BOOLEAN(0, "stdio", &report.use_stdio,
+                   "Use the stdio interface"),
        OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
-                  "sort by key(s): pid, comm, dso, symbol, parent"),
-       OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths,
-                   "Don't shorten the pathnames taking into account the cwd"),
+                  "sort by key(s): pid, comm, dso, symbol, parent, dso_to,"
+                  " dso_from, symbol_to, symbol_from, mispredict"),
+       OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
+                   "Show sample percentage for different cpu modes"),
        OPT_STRING('p', "parent", &parent_pattern, "regex",
                   "regex filter to identify parent, see: '--sort parent'"),
        OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
                    "Only display entries with parent-match"),
-       OPT_CALLBACK_DEFAULT('g', "call-graph", NULL, "output_type,min_percent",
-                    "Display callchains using output_type and min percent threshold. "
-                    "Default: fractal,0.5", &parse_callchain_opt, callchain_default_opt),
+       OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",
+                    "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. "
+                    "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),
+       OPT_BOOLEAN('G', "inverted", &report.inverted_callchain,
+                   "alias for inverted call graph"),
        OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
                   "only consider symbols in these dsos"),
-       OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
+       OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
                   "only consider symbols in these comms"),
        OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
                   "only consider these symbols"),
+       OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter",
+                  "only show symbols that (partially) match with this filter"),
        OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str,
                   "width[,width...]",
                   "don't try to adjust column width, use these fixed values"),
        OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
                   "separator for columns, no spaces will be added between "
                   "columns '.' is reserved."),
-       OPT_BOOLEAN('U', "hide-unresolved", &hide_unresolved,
+       OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved,
                    "Only display entries resolved to a symbol"),
+       OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
+                   "Look for files with symbols relative to this directory"),
+       OPT_STRING('C', "cpu", &report.cpu_list, "cpu",
+                  "list of cpus to profile"),
+       OPT_BOOLEAN('I', "show-info", &report.show_full_info,
+                   "Display extended information about perf.data file"),
+       OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
+                   "Interleave source code with assembly code (default)"),
+       OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
+                   "Display raw encoding of assembly instructions (default)"),
+       OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
+                  "Specify disassembler style (e.g. -M intel for intel syntax)"),
+       OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
+                   "Show a column with the sum of periods"),
+       OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "",
+                   "use branch records for histogram filling", parse_branch_mode),
        OPT_END()
-};
+       };
 
-int cmd_report(int argc, const char **argv, const char *prefix __used)
-{
        argc = parse_options(argc, argv, options, report_usage, 0);
 
-       setup_browser();
+       if (report.use_stdio)
+               use_browser = 0;
+       else if (report.use_tui)
+               use_browser = 1;
+       else if (report.use_gtk)
+               use_browser = 2;
+
+       if (report.inverted_callchain)
+               callchain_param.order = ORDER_CALLER;
+
+       if (!report.input_name || !strlen(report.input_name)) {
+               if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode))
+                       report.input_name = "-";
+               else
+                       report.input_name = "perf.data";
+       }
+       session = perf_session__new(report.input_name, O_RDONLY,
+                                   report.force, false, &report.tool);
+       if (session == NULL)
+               return -ENOMEM;
+
+       report.session = session;
+
+       has_br_stack = perf_header__has_feat(&session->header,
+                                            HEADER_BRANCH_STACK);
+
+       if (sort__branch_mode == -1 && has_br_stack)
+               sort__branch_mode = 1;
+
+       /* sort__branch_mode could be 0 if --no-branch-stack */
+       if (sort__branch_mode == 1) {
+               /*
+                * if no sort_order is provided, then specify
+                * branch-mode specific order
+                */
+               if (sort_order == default_sort_order)
+                       sort_order = "comm,dso_from,symbol_from,"
+                                    "dso_to,symbol_to";
+
+       }
+
+       if (strcmp(report.input_name, "-") != 0) {
+               if (report.use_gtk)
+                       perf_gtk_setup_browser(argc, argv, true);
+               else
+                       setup_browser(true);
+       } else {
+               use_browser = 0;
+       }
+
+       /*
+        * Only in the newt browser we are doing integrated annotation,
+        * so don't allocate extra space that won't be used in the stdio
+        * implementation.
+        */
+       if (use_browser > 0) {
+               symbol_conf.priv_size = sizeof(struct annotation);
+               report.annotate_init  = symbol__annotate_init;
+               /*
+                * For searching by name on the "Browse map details".
+                * providing it only in verbose mode not to bloat too
+                * much struct symbol.
+                */
+               if (verbose) {
+                       /*
+                        * XXX: Need to provide a less kludgy way to ask for
+                        * more space per symbol, the u32 is for the index on
+                        * the ui browser.
+                        * See symbol__browser_index.
+                        */
+                       symbol_conf.priv_size += sizeof(u32);
+                       symbol_conf.sort_by_name = true;
+               }
+       }
 
        if (symbol__init() < 0)
-               return -1;
+               goto error;
 
        setup_sorting(report_usage, options);
 
        if (parent_pattern != default_parent_pattern) {
-               sort_dimension__add("parent");
-               sort_parent.elide = 1;
+               if (sort_dimension__add("parent") < 0)
+                       goto error;
+
+               /*
+                * Only show the parent fields if we explicitly
+                * sort that way. If we only use parent machinery
+                * for filtering, we don't want it.
+                */
+               if (!strstr(sort_order, "parent"))
+                       sort_parent.elide = 1;
        } else
                symbol_conf.exclude_other = false;
 
-       /*
-        * Any (unrecognized) arguments left?
-        */
-       if (argc)
-               usage_with_options(report_usage, options);
+       if (argc) {
+               /*
+                * Special case: if there's an argument left then assume that
+                * it's a symbol filter:
+                */
+               if (argc > 1)
+                       usage_with_options(report_usage, options);
+
+               report.symbol_filter_str = argv[0];
+       }
 
-       sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
        sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
-       sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
 
-       return __cmd_report();
+       if (sort__branch_mode == 1) {
+               sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout);
+               sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout);
+               sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout);
+               sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout);
+       } else {
+               sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
+               sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
+       }
+
+       ret = __cmd_report(&report);
+error:
+       perf_session__delete(session);
+       return ret;
 }