3 files changed, 38 insertions, 6 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),
 };
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 873c8778db20..e5670f1af737 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -17,11 +17,13 @@
 #include "debug.h"
 #include "annotate.h"
 #include "evsel.h"
+#include <regex.h>
 #include <pthread.h>
 #include <linux/bitops.h>
 
 const char      *disassembler_style;
 const char      *objdump_path;
+static regex_t   file_lineno;
 
 static struct ins *ins__find(const char *name);
 static int disasm_line__parse(char *line, char **namep, char **rawp);
@@ -570,13 +572,15 @@ out_free_name:
         return -1;
 }
 
-static struct disasm_line *disasm_line__new(s64 offset, char *line, size_t privsize)
+static struct disasm_line *disasm_line__new(s64 offset, char *line,
+                                        size_t privsize, int line_nr)
 {
         struct disasm_line *dl = zalloc(sizeof(*dl) + privsize);
 
         if (dl != NULL) {
                 dl->offset = offset;
                 dl->line = strdup(line);
+                dl->line_nr = line_nr;
                 if (dl->line == NULL)
                         goto out_delete;
 
@@ -788,13 +792,15 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
  * The ops.raw part will be parsed further according to type of the instruction.
  */
 static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
-                                      FILE *file, size_t privsize)
+                                      FILE *file, size_t privsize,
+                                      int *line_nr)
 {
         struct annotation *notes = symbol__annotation(sym);
         struct disasm_line *dl;
         char *line = NULL, *parsed_line, *tmp, *tmp2, *c;
         size_t line_len;
         s64 line_ip, offset = -1;
+        regmatch_t match[2];
 
         if (getline(&line, &line_len, file) < 0)
                 return -1;
@@ -812,6 +818,12 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
         line_ip = -1;
         parsed_line = line;
 
+        /* /filename:linenr ? Save line number and ignore. */
+        if (regexec(&file_lineno, line, 2, match, 0) == 0) {
+                *line_nr = atoi(line + match[1].rm_so);
+                return 0;
+        }
+
         /*
          * Strip leading spaces:
          */
@@ -842,8 +854,9 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
                         parsed_line = tmp2 + 1;
         }
 
-        dl = disasm_line__new(offset, parsed_line, privsize);
+        dl = disasm_line__new(offset, parsed_line, privsize, *line_nr);
         free(line);
+        (*line_nr)++;
 
         if (dl == NULL)
                 return -1;
@@ -869,6 +882,11 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
         return 0;
 }
 
+static __attribute__((constructor)) void symbol__init_regexpr(void)
+{
+        regcomp(&file_lineno, "^/[^:]+:([0-9]+)", REG_EXTENDED);
+}
+
 static void delete_last_nop(struct symbol *sym)
 {
         struct annotation *notes = symbol__annotation(sym);
@@ -904,6 +922,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
         char symfs_filename[PATH_MAX];
         struct kcore_extract kce;
         bool delete_extract = false;
+        int lineno = 0;
 
         if (filename)
                 symbol__join_symfs(symfs_filename, filename);
@@ -984,7 +1003,7 @@ fallback:
         snprintf(command, sizeof(command),
                  "%s %s%s --start-address=0x%016" PRIx64
                  " --stop-address=0x%016" PRIx64
-                 " -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
+                 " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
                  objdump_path ? objdump_path : "objdump",
                  disassembler_style ? "-M " : "",
                  disassembler_style ? disassembler_style : "",
@@ -1001,7 +1020,8 @@ fallback:
                 goto out_free_filename;
 
         while (!feof(file))
-                if (symbol__parse_objdump_line(sym, map, file, privsize) < 0)
+                if (symbol__parse_objdump_line(sym, map, file, privsize,
+                            &lineno) < 0)
                         break;
 
         /*
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 112d6e268150..0784a9420528 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -58,6 +58,7 @@ struct disasm_line {
         char                *line;
         char                *name;
         struct ins          *ins;
+        int                 line_nr;
         struct ins_operands ops;
 };