Merge tag 'for-4.18/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[sfrench/cifs-2.6.git] / tools / perf / builtin-annotate.c

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index da57042402397075f873529527489e4b390862f2..5eb22cc563636c11d4e12bf42c71f00b3e1255db 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -40,9 +40,8 @@
 struct perf_annotate {
        struct perf_tool tool;
        struct perf_session *session;
+       struct annotation_options opts;
        bool       use_tui, use_stdio, use_stdio2, use_gtk;
-       bool       full_paths;
-       bool       print_line;
        bool       skip_missing;
        bool       has_br_stack;
        bool       group_set;
@@ -162,12 +161,12 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,
        hist__account_cycles(sample->branch_stack, al, sample, false);
 
        bi = he->branch_info;
-       err = addr_map_symbol__inc_samples(&bi->from, sample, evsel->idx);
+       err = addr_map_symbol__inc_samples(&bi->from, sample, evsel);
 
        if (err)
                goto out;
 
-       err = addr_map_symbol__inc_samples(&bi->to, sample, evsel->idx);
+       err = addr_map_symbol__inc_samples(&bi->to, sample, evsel);
 
 out:
        return err;
@@ -249,7 +248,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
        if (he == NULL)
                return -ENOMEM;
 
-       ret = hist_entry__inc_addr_samples(he, sample, evsel->idx, al->addr);
+       ret = hist_entry__inc_addr_samples(he, sample, evsel, al->addr);
        hists__inc_nr_samples(hists, true);
        return ret;
 }
@@ -289,10 +288,9 @@ static int hist_entry__tty_annotate(struct hist_entry *he,
                                    struct perf_annotate *ann)
 {
        if (!ann->use_stdio2)
-               return symbol__tty_annotate(he->ms.sym, he->ms.map, evsel,
-                                           ann->print_line, ann->full_paths, 0, 0);
-       return symbol__tty_annotate2(he->ms.sym, he->ms.map, evsel,
-                                    ann->print_line, ann->full_paths);
+               return symbol__tty_annotate(he->ms.sym, he->ms.map, evsel, &ann->opts);
+
+       return symbol__tty_annotate2(he->ms.sym, he->ms.map, evsel, &ann->opts);
 }
 
 static void hists__find_annotations(struct hists *hists,
@@ -343,7 +341,7 @@ find_next:
                        /* skip missing symbols */
                        nd = rb_next(nd);
                } else if (use_browser == 1) {
-                       key = hist_entry__tui_annotate(he, evsel, NULL);
+                       key = hist_entry__tui_annotate(he, evsel, NULL, &ann->opts);
 
                        switch (key) {
                        case -1:
@@ -390,8 +388,9 @@ static int __cmd_annotate(struct perf_annotate *ann)
                        goto out;
        }
 
-       if (!objdump_path) {
-               ret = perf_env__lookup_objdump(&session->header.env);
+       if (!ann->opts.objdump_path) {
+               ret = perf_env__lookup_objdump(&session->header.env,
+                                              &ann->opts.objdump_path);
                if (ret)
                        goto out;
        }
@@ -476,6 +475,7 @@ int cmd_annotate(int argc, const char **argv)
                        .ordered_events = true,
                        .ordering_requires_timestamps = true,
                },
+               .opts = annotation__default_options,
        };
        struct perf_data data = {
                .mode  = PERF_DATA_MODE_READ,
@@ -503,9 +503,9 @@ int cmd_annotate(int argc, const char **argv)
                   "file", "vmlinux pathname"),
        OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
                    "load module symbols - WARNING: use only with -k and LIVE kernel"),
-       OPT_BOOLEAN('l', "print-line", &annotate.print_line,
+       OPT_BOOLEAN('l', "print-line", &annotate.opts.print_lines,
                    "print matching source lines (may be slow)"),
-       OPT_BOOLEAN('P', "full-paths", &annotate.full_paths,
+       OPT_BOOLEAN('P', "full-paths", &annotate.opts.full_path,
                    "Don't shorten the displayed pathnames"),
        OPT_BOOLEAN(0, "skip-missing", &annotate.skip_missing,
                    "Skip symbols that cannot be annotated"),
@@ -516,13 +516,13 @@ int cmd_annotate(int argc, const char **argv)
        OPT_CALLBACK(0, "symfs", NULL, "directory",
                     "Look for files with symbols relative to this directory",
                     symbol__config_symfs),
-       OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
+       OPT_BOOLEAN(0, "source", &annotate.opts.annotate_src,
                    "Interleave source code with assembly code (default)"),
-       OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
+       OPT_BOOLEAN(0, "asm-raw", &annotate.opts.show_asm_raw,
                    "Display raw encoding of assembly instructions (default)"),
-       OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
+       OPT_STRING('M', "disassembler-style", &annotate.opts.disassembler_style, "disassembler style",
                   "Specify disassembler style (e.g. -M intel for intel syntax)"),
-       OPT_STRING(0, "objdump", &objdump_path, "path",
+       OPT_STRING(0, "objdump", &annotate.opts.objdump_path, "path",
                   "objdump binary to use for disassembly and annotations"),
        OPT_BOOLEAN(0, "group", &symbol_conf.event_group,
                    "Show event group information together"),