perf annotate stdio: Use annotation_options consistently

Accross all the routines, this way we can have eventually have a
consistent set of defaults for all UIs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-6qgtixurjgdk5u0n3rw78ges@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 2b21bbcd70ea..7238010f28d4 100644
--- 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;
@@ -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,
@@ -476,6 +474,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 +502,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"),