perf annotate: Move annotation_options out of the TUI browser

This will be useful when making parts of the TUI browser generic enough
to be used for a new stdio mode, available even when the TUI is not
built in, for explicit user decision or when the necessary library devel
files, for the slang library currently, are not available in the build
system.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.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-45twzienhz7ypbad0sbvojku@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 618edf96353c40ec998f850251160219afce119d..69ec968ac0be8fb0b8359b5e584c7d9afd047255 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -31,15 +31,7 @@ struct browser_line {
        int     jump_sources;
 };
 
-static struct annotate_browser_opt {
-       bool hide_src_code,
-            use_offset,
-            jump_arrows,
-            show_linenr,
-            show_nr_jumps,
-            show_nr_samples,
-            show_total_period;
-} annotate_browser__opts = {
+static struct annotation_options annotate_browser__opts = {
        .use_offset     = true,
        .jump_arrows    = true,
 };

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 7e914e834101bd0e3b7cb6b43d2b0705f5cddeb4..e924033432a37491a6faab19fc6dcd6d39549b66 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -58,6 +58,16 @@ bool ins__is_lock(const struct ins *ins);
 int ins__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops);
 bool ins__is_fused(struct arch *arch, const char *ins1, const char *ins2);
 
+struct annotation_options {
+       bool hide_src_code,
+            use_offset,
+            jump_arrows,
+            show_linenr,
+            show_nr_jumps,
+            show_nr_samples,
+            show_total_period;
+};
+
 struct annotation;
 
 struct sym_hist_entry {