[PATCH v1 4/4] perf annotate: Enable the '--tui-dump' mode

[Jin Yao]

It creates a new option '--tui-dump' in perf annotate command line.

With this option, for example, the perf annotate output:

$ perf annotate compute_flag --tui-dump

Percent  IPC Cycle

                        Disassembly of section .text:

                        0000000000400640 <compute_flag>:
                        compute_flag():
                        volatile int count;
                        static unsigned int s_randseed;

                        __attribute__((noinline))
                        int compute_flag()
                        {
 23.00  1.16              sub    $0x8,%rsp
                                int i;

                                i = rand() % 2;
 23.06  1.16     1        callq  rand@plt

                                return i;
 27.01  3.38              mov    %eax,%edx
                        }
        3.38              add    $0x8,%rsp
                        {
                                int i;

                                i = rand() % 2;

                                return i;
        3.38              shr    $0x1f,%edx
        3.38              add    %edx,%eax
        3.38              and    $0x1,%eax
        3.38              sub    %edx,%eax
                        }
 26.93  3.38     2        retq

Compared to TUI output,

$ perf annotate compute_flag

       â                Disassembly of section .text:
       â
       â                0000000000400640 <compute_flag>
       â                compute_flag():
       â                volatile int count;
       â                static unsigned int s_randseed;
       â
       â                __attribute__((noinline))
       â                int compute_flag()
       â                {
 23.00 â1.16              sub    $0x8,%rsp
       â                        int i;
       â
       â                        i = rand() % 2;
 23.06 â1.16     1      â callq  rand@plt
       â
       â                        return i;
 27.01 â3.38              mov    %eax,%edx
       â                }
       â3.38              add    $0x8,%rsp
       â                {
       â                        int i;
       â
       â                        i = rand() % 2;
       â
       â                        return i;
       â3.38              shr    $0x1f,%edx
       â3.38              add    %edx,%eax
       â3.38              and    $0x1,%eax
       â3.38              sub    %edx,%eax
       â                }
 26.93 â3.38     2      â retq

Signed-off-by: Jin Yao <yao.jin@xxxxxxxxxxxxxxx>
---
 tools/perf/Documentation/perf-annotate.txt |  3 +++
 tools/perf/builtin-annotate.c              | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
index 292809c3..d52ae47 100644
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -83,6 +83,9 @@ OPTIONS
 
 --gtk:: Use the GTK interface.
 
+--tui-dump: Use the TUI interface. The TUI output is dumped to stdio
+	    interface.
+
 -C::
 --cpu=<cpu>:: Only report samples for the list of CPUs provided. Multiple CPUs can
 	be provided as a comma-separated list with no space: 0,1. Ranges of
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 8ba8e2c..5110160 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -41,6 +41,7 @@ struct perf_annotate {
 	struct perf_tool tool;
 	struct perf_session *session;
 	bool	   use_tui, use_stdio, use_gtk;
+	bool	   tui_dump;
 	bool	   full_paths;
 	bool	   print_line;
 	bool	   skip_missing;
@@ -334,7 +335,10 @@ static void hists__find_annotations(struct hists *hists,
 			/* skip missing symbols */
 			nd = rb_next(nd);
 		} else if (use_browser == 1) {
-			key = hist_entry__tui_annotate(he, evsel, NULL, false);
+			key = hist_entry__tui_annotate(he, evsel, NULL,
+						       ann->tui_dump);
+			if (ann->tui_dump)
+				return;
 
 			switch (key) {
 			case -1:
@@ -486,6 +490,7 @@ int cmd_annotate(int argc, const char **argv)
 		    "dump raw trace in ASCII"),
 	OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"),
 	OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"),
+	OPT_BOOLEAN(0, "tui-dump", &annotate.tui_dump, "Dump TUI content"),
 	OPT_BOOLEAN(0, "stdio", &annotate.use_stdio, "Use the stdio interface"),
 	OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
 		   "file", "vmlinux pathname"),
@@ -576,7 +581,10 @@ int cmd_annotate(int argc, const char **argv)
 	else if (annotate.use_gtk)
 		use_browser = 2;
 
-	setup_browser(true, false);
+	if (annotate.tui_dump)
+		use_browser = 1;
+
+	setup_browser(true, annotate.tui_dump);
 
 	if (use_browser == 1 && annotate.has_br_stack) {
 		sort__mode = SORT_MODE__BRANCH;
-- 
2.7.4