perf annotate: Support source line numbers in annotate

With srcline key/sort'ing it's useful to have line numbers in the
annotate window. This patch implements this.

Use objdump -l to request the line numbers and save them in the line
structure. Then the browser displays them for source lines.

The line numbers are not displayed by default, but can be toggled on
with 'k'

There is one unfortunate problem with this setup. For lines not
containing source and which are outside functions objdump -l reports
line numbers off by a few: it always reports the first line number in
the next function even for lines that are outside the function.

I haven't found a nice way to detect/correct this. Probably objdump has
to be fixed.

See https://sourceware.org/bugzilla/show_bug.cgi?id=16433

The line numbers are still useful even with these problems, as most are
correct and the ones which are not are nearby.

v2: Fix help text. Handle (discriminator...) output in objdump.
Left align the line numbers.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1415844328-4884-9-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index f0697a3aede0..1e0a2fd80115 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -27,6 +27,7 @@ static struct annotate_browser_opt {
         bool hide_src_code,
              use_offset,
              jump_arrows,
+             show_linenr,
              show_nr_jumps;
 } annotate_browser__opts = {
         .use_offset     = true,
@@ -128,7 +129,11 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
         if (!*dl->line)
                 slsmg_write_nstring(" ", width - pcnt_width);
         else if (dl->offset == -1) {
-                printed = scnprintf(bf, sizeof(bf), "%*s  ",
+                if (dl->line_nr && annotate_browser__opts.show_linenr)
+                        printed = scnprintf(bf, sizeof(bf), "%-*d ",
+                                        ab->addr_width + 1, dl->line_nr);
+                else
+                        printed = scnprintf(bf, sizeof(bf), "%*s  ",
                                     ab->addr_width, " ");
                 slsmg_write_nstring(bf, printed);
                 slsmg_write_nstring(dl->line, width - printed - pcnt_width + 1);
@@ -733,6 +738,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
                 "o             Toggle disassembler output/simplified view\n"
                 "s             Toggle source code view\n"
                 "/             Search string\n"
+                "k             Toggle line numbers\n"
                 "r             Run available scripts\n"
                 "?             Search string backwards\n");
                         continue;
@@ -741,6 +747,10 @@ static int annotate_browser__run(struct annotate_browser *browser,
                                 script_browse(NULL);
                                 continue;
                         }
+                case 'k':
+                        annotate_browser__opts.show_linenr =
+                                !annotate_browser__opts.show_linenr;
+                        break;
                 case 'H':
                         nd = browser->curr_hot;
                         break;
@@ -984,6 +994,7 @@ static struct annotate_config {
 } annotate__configs[] = {
         ANNOTATE_CFG(hide_src_code),
         ANNOTATE_CFG(jump_arrows),
+        ANNOTATE_CFG(show_linenr),
         ANNOTATE_CFG(show_nr_jumps),
         ANNOTATE_CFG(use_offset),
 };