linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jolsa@kernel.org, treeze.taeung@gmail.com, ak@linux.intel.com,
	tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org,
	namhyung@kernel.org, acme@redhat.com, mingo@kernel.org
Subject: [tip:perf/core] perf annotate: Use stripped line instead of raw disassemble line
Date: Tue, 11 Apr 2017 22:42:33 -0700	[thread overview]
Message-ID: <tip-986a5bc028a84d487c354a529730b48682d1fb41@git.kernel.org> (raw)
In-Reply-To: <1491612748-1605-3-git-send-email-treeze.taeung@gmail.com>

Commit-ID:  986a5bc028a84d487c354a529730b48682d1fb41
Gitweb:     http://git.kernel.org/tip/986a5bc028a84d487c354a529730b48682d1fb41
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Sat, 8 Apr 2017 09:52:25 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 11 Apr 2017 16:22:23 -0300

perf annotate: Use stripped line instead of raw disassemble line

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 204790d..30498a2 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;
 	}
 

  reply	other threads:[~2017-04-12  5:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-08  0:52 [PATCH v2 0/5] Refactoring with ltrim() and rtrim() Taeung Song
2017-04-08  0:52 ` [PATCH v2 1/5] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Taeung Song
2017-04-12  5:42   ` [tip:perf/core] " tip-bot for Taeung Song
2017-04-08  0:52 ` [PATCH v2 2/5] perf annotate: Use stripped line instead of raw disassemble line Taeung Song
2017-04-12  5:42   ` tip-bot for Taeung Song [this message]
2017-04-08  0:52 ` [PATCH v2 3/5] perf ui browser: Refactor the code to parse color configs with ltrim() Taeung Song
2017-04-08  0:52 ` [PATCH v2 4/5] perf pmu: Refactor wordwrap() " Taeung Song
2017-04-08  0:52 ` [PATCH v2 5/5] perf tools: Refactor the code to strip command name with {l,r}trim() Taeung Song
2017-04-08 18:48   ` David Ahern
2017-04-09  5:36     ` Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-986a5bc028a84d487c354a529730b48682d1fb41@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=treeze.taeung@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).