Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1621732

[PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line

Show all headers | View raw

From: Taeung Song <treeze.taeung@gmail.com>

When parsing disassemble lines for source line number, use a stripped
line instead of raw line.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1491612748-1605-3-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/annotate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 204790db10f1..30498a2d4a6f 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1159,8 +1159,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
 	parsed_line = rtrim(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);
+	if (regexec(&file_lineno, parsed_line, 2, match, 0) == 0) {
+		*line_nr = atoi(parsed_line + match[1].rm_so);
 		return 0;
 	}
 
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 09/18] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 03/18] perf evsel: Return exact sub event which failed with EPERM for wildcards Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 14/18] perf annotate: Process attr and build_id records Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 16/18] perf tools: Do not print missing features in pipe-mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 07/18] perf tools: Refactor the code to strip command name with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 12/18] perf inject: Copy events when reordering events in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 08/18] perf string: Simplify ltrim() implementation Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 17/18] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 10/18] perf annotate s390: Implement jump types for perf annotate Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 06/18] perf pmu: Refactor wordwrap() with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 13/18] perf tools: Describe pipe mode in perf.data-file-fomat.txt Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 15/18] perf session: Don't rely on evlist in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 05/18] perf ui browser: Refactor the code to parse color configs with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 02/18] perf script: Use strtok_r() when parsing output field list Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 07:40 +0200
    Re: [GIT PULL 00/18] perf/core improvements and fixes Christian Borntraeger <borntraeger@de.ibm.com> - 2017-04-12 09:20 +0200
      Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 09:30 +0200

csiph-web