1 files changed, 58 insertions, 64 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 212214162bb2..71e6402729a8 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -246,10 +246,10 @@ static struct hist_entry *perf_evsel__add_hist_entry(struct perf_evsel *evsel,
         struct hist_entry *he;
 
         pthread_mutex_lock(&evsel->hists.lock);
-        he = __hists__add_entry(&evsel->hists, al, NULL, sample->period,
-                                sample->weight);
+        he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL,
+                                sample->period, sample->weight,
+                                sample->transaction);
         pthread_mutex_unlock(&evsel->hists.lock);
-
         if (he == NULL)
                 return NULL;
 
@@ -287,7 +287,7 @@ static void perf_top__print_sym_table(struct perf_top *top)
                 return;
         }
 
-        hists__collapse_resort(&top->sym_evsel->hists);
+        hists__collapse_resort(&top->sym_evsel->hists, NULL);
         hists__output_resort(&top->sym_evsel->hists);
         hists__decay_entries(&top->sym_evsel->hists,
                              top->hide_user_symbols,
@@ -553,7 +553,7 @@ static void perf_top__sort_new_samples(void *arg)
         if (t->evlist->selected != NULL)
                 t->sym_evsel = t->evlist->selected;
 
-        hists__collapse_resort(&t->sym_evsel->hists);
+        hists__collapse_resort(&t->sym_evsel->hists, NULL);
         hists__output_resort(&t->sym_evsel->hists);
         hists__decay_entries(&t->sym_evsel->hists,
                              t->hide_user_symbols,
@@ -771,7 +771,8 @@ static void perf_event__process_sample(struct perf_tool *tool,
                     sample->callchain) {
                         err = machine__resolve_callchain(machine, evsel,
                                                          al.thread, sample,
-                                                         &parent, &al);
+                                                         &parent, &al,
+                                                         top->max_stack);
                         if (err)
                                 return;
                 }
@@ -810,7 +811,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                 ret = perf_evlist__parse_sample(top->evlist, event, &sample);
                 if (ret) {
                         pr_err("Can't parse sample, err = %d\n", ret);
-                        continue;
+                        goto next_event;
                 }
 
                 evsel = perf_evlist__id2evsel(session->evlist, sample.id);
@@ -825,13 +826,13 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                 case PERF_RECORD_MISC_USER:
                         ++top->us_samples;
                         if (top->hide_user_symbols)
-                                continue;
+                                goto next_event;
                         machine = &session->machines.host;
                         break;
                 case PERF_RECORD_MISC_KERNEL:
                         ++top->kernel_samples;
                         if (top->hide_kernel_symbols)
-                                continue;
+                                goto next_event;
                         machine = &session->machines.host;
                         break;
                 case PERF_RECORD_MISC_GUEST_KERNEL:
@@ -847,7 +848,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                          */
                         /* Fall thru */
                 default:
-                        continue;
+                        goto next_event;
                 }
 
 
@@ -856,9 +857,11 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                                                    &sample, machine);
                 } else if (event->header.type < PERF_RECORD_MAX) {
                         hists__inc_nr_events(&evsel->hists, event->header.type);
-                        machine__process_event(machine, event);
+                        machine__process_event(machine, event, &sample);
                 } else
                         ++session->stats.nr_unknown_events;
+next_event:
+                perf_evlist__mmap_consume(top->evlist, idx);
         }
 }
 
@@ -930,11 +933,8 @@ static int __cmd_top(struct perf_top *top)
         struct perf_record_opts *opts = &top->record_opts;
         pthread_t thread;
         int ret;
-        /*
-         * FIXME: perf_session__new should allow passing a O_MMAP, so that all this
-         * mmap reading, etc is encapsulated in it. Use O_WRONLY for now.
-         */
-        top->session = perf_session__new(NULL, O_WRONLY, false, false, NULL);
+
+        top->session = perf_session__new(NULL, false, NULL);
         if (top->session == NULL)
                 return -ENOMEM;
 
@@ -950,14 +950,8 @@ static int __cmd_top(struct perf_top *top)
         if (ret)
                 goto out_delete;
 
-        if (perf_target__has_task(&opts->target))
-                perf_event__synthesize_thread_map(&top->tool, top->evlist->threads,
-                                                  perf_event__process,
-                                                  &top->session->machines.host);
-        else
-                perf_event__synthesize_threads(&top->tool, perf_event__process,
-                                               &top->session->machines.host);
-
+        machine__synthesize_threads(&top->session->machines.host, &opts->target,
+                                    top->evlist->threads, false);
         ret = perf_top__start_counters(top);
         if (ret)
                 goto out_delete;
@@ -973,7 +967,7 @@ static int __cmd_top(struct perf_top *top)
          * XXX 'top' still doesn't start workloads like record, trace, but should,
          * so leave the check here.
          */
-        if (!perf_target__none(&opts->target))
+        if (!target__none(&opts->target))
                 perf_evlist__enable(top->evlist);
 
         /* Wait for a minimal set of events before starting the snapshot */
@@ -1016,16 +1010,16 @@ out_delete:
 }
 
 static int
-parse_callchain_opt(const struct option *opt, const char *arg, int unset)
+callchain_opt(const struct option *opt, const char *arg, int unset)
 {
-        /*
-         * --no-call-graph
-         */
-        if (unset)
-                return 0;
-
         symbol_conf.use_callchain = true;
+        return record_callchain_opt(opt, arg, unset);
+}
 
+static int
+parse_callchain_opt(const struct option *opt, const char *arg, int unset)
+{
+        symbol_conf.use_callchain = true;
         return record_parse_callchain_opt(opt, arg, unset);
 }
 
@@ -1041,7 +1035,7 @@ parse_percent_limit(const struct option *opt, const char *arg,
 
 int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-        int status;
+        int status = -1;
         char errbuf[BUFSIZ];
         struct perf_top top = {
                 .count_filter        = 5,
@@ -1051,14 +1045,15 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                         .user_freq      = UINT_MAX,
                         .user_interval  = ULLONG_MAX,
                         .freq           = 4000, /* 4 KHz */
-                        .target              = {
+                        .target         = {
                                 .uses_mmap   = true,
                         },
                 },
+                .max_stack           = PERF_MAX_STACK_DEPTH,
                 .sym_pcnt_filter     = 5,
         };
         struct perf_record_opts *opts = &top.record_opts;
-        struct perf_target *target = &opts->target;
+        struct target *target = &opts->target;
         const struct option options[] = {
         OPT_CALLBACK('e', "event", &top.evlist, "event",
                      "event selector. use 'perf list' to list available events",
@@ -1074,10 +1069,13 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                     "list of cpus to monitor"),
         OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                    "file", "vmlinux pathname"),
+        OPT_BOOLEAN(0, "ignore-vmlinux", &symbol_conf.ignore_vmlinux,
+                    "don't load vmlinux even if found"),
         OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols,
                     "hide kernel symbols"),
-        OPT_UINTEGER('m', "mmap-pages", &opts->mmap_pages,
-                     "number of mmap data pages"),
+        OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages",
+                     "number of mmap data pages",
+                     perf_evlist__parse_mmap_pages),
         OPT_INTEGER('r', "realtime", &top.realtime_prio,
                     "collect data with this RT SCHED_FIFO priority"),
         OPT_INTEGER('d', "delay", &top.delay_secs,
@@ -1103,12 +1101,19 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show counter open errors, etc)"),
         OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
-                   "sort by key(s): pid, comm, dso, symbol, parent, weight, local_weight"),
+                   "sort by key(s): pid, comm, dso, symbol, parent, weight, local_weight,"
+                   " abort, in_tx, transaction"),
         OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
                     "Show a column with the number of samples"),
-        OPT_CALLBACK_DEFAULT('G', "call-graph", &top.record_opts,
-                             "mode[,dump_size]", record_callchain_help,
-                             &parse_callchain_opt, "fp"),
+        OPT_CALLBACK_NOOPT('G', NULL, &top.record_opts,
+                           NULL, "enables call-graph recording",
+                           &callchain_opt),
+        OPT_CALLBACK(0, "call-graph", &top.record_opts,
+                     "mode[,dump_size]", record_callchain_help,
+                     &parse_callchain_opt),
+        OPT_INTEGER(0, "max-stack", &top.max_stack,
+                    "Set the maximum stack depth when parsing the callchain. "
+                    "Default: " __stringify(PERF_MAX_STACK_DEPTH)),
         OPT_CALLBACK(0, "ignore-callees", NULL, "regex",
                    "ignore callees of these functions in call graphs",
                    report_parse_ignore_callees_opt),
@@ -1149,8 +1154,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         if (sort_order == default_sort_order)
                 sort_order = "dso,symbol";
 
-        if (setup_sorting() < 0)
-                usage_with_options(top_usage, options);
+        if (setup_sorting() < 0) {
+                parse_options_usage(top_usage, options, "s", 1);
+                goto out_delete_evlist;
+        }
 
         /* display thread wants entries to be collapsed in a different tree */
         sort__need_collapse = 1;
@@ -1162,24 +1169,24 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 
         setup_browser(false);
 
-        status = perf_target__validate(target);
+        status = target__validate(target);
         if (status) {
-                perf_target__strerror(target, status, errbuf, BUFSIZ);
-                ui__warning("%s", errbuf);
+                target__strerror(target, status, errbuf, BUFSIZ);
+                ui__warning("%s\n", errbuf);
         }
 
-        status = perf_target__parse_uid(target);
+        status = target__parse_uid(target);
         if (status) {
                 int saved_errno = errno;
 
-                perf_target__strerror(target, status, errbuf, BUFSIZ);
-                ui__error("%s", errbuf);
+                target__strerror(target, status, errbuf, BUFSIZ);
+                ui__error("%s\n", errbuf);
 
                 status = -saved_errno;
                 goto out_delete_evlist;
         }
 
-        if (perf_target__none(target))
+        if (target__none(target))
                 target->system_wide = true;
 
         if (perf_evlist__create_maps(top.evlist, target) < 0)
@@ -1196,20 +1203,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         if (top.delay_secs < 1)
                 top.delay_secs = 1;
 
-        if (opts->user_interval != ULLONG_MAX)
-                opts->default_interval = opts->user_interval;
-        if (opts->user_freq != UINT_MAX)
-                opts->freq = opts->user_freq;
-
-        /*
-         * User specified count overrides default frequency.
-         */
-        if (opts->default_interval)
-                opts->freq = 0;
-        else if (opts->freq) {
-                opts->default_interval = opts->freq;
-        } else {
-                ui__error("frequency and count are zero, aborting\n");
+        if (perf_record_opts__config(opts)) {
                 status = -EINVAL;
                 goto out_delete_maps;
         }