perf report: Librarize the annotation code and use it in the newt browser

Now we don't anymore use popen to run 'perf annotate' for the selected
symbol, instead we collect per address samplings when processing samples
in 'perf report' if we're using the newt browser, then we use this data
directly to do annotation.

Done this way we can actually traverse the objdump_line objects
directly, matching the addresses to the collected samples and colouring
them appropriately using lower level slang routines.

The new ui_browser class will be reused for the main, callchain aware,
histogram browser, when it will be made generic and don't assume that
the objects are always instances of the objdump_line class maintained
using list_heads.

Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 3d67d6bf22cf..04de3387de3f 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -106,8 +106,18 @@ static int perf_session__add_hist_entry(struct perf_session *self,
         if (he == NULL)
                 goto out_free_syms;
         err = 0;
-        if (symbol_conf.use_callchain)
+        if (symbol_conf.use_callchain) {
                 err = append_chain(he->callchain, data->callchain, syms);
+                if (err)
+                        goto out_free_syms;
+        }
+        /*
+         * Only in the newt browser we are doing integrated annotation,
+         * so we don't allocated the extra space needed because the stdio
+         * code will not use it.
+         */
+        if (use_browser)
+                err = hist_entry__inc_addr_samples(he, al->addr);
 out_free_syms:
         free(syms);
         return err;
@@ -458,6 +468,13 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 
         if (strcmp(input_name, "-") != 0)
                 setup_browser();
+        /*
+         * Only in the newt browser we are doing integrated annotation,
+         * so don't allocate extra space that won't be used in the stdio
+         * implementation.
+         */
+        if (use_browser)
+                symbol_conf.priv_size = sizeof(struct sym_priv);
 
         if (symbol__init() < 0)
                 return -1;