From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@kernel.org, a.p.zijlstra@chello.nl, jolsa@redhat.com,
dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com,
hpa@zytor.com
Subject: [tip:perf/core] perf top: Fix annotation on --stdio
Date: Mon, 14 Dec 2015 00:37:13 -0800 [thread overview]
Message-ID: <tip-448f13b2d18fdc8dbaada97442e8954dcb4ef8fa@git.kernel.org> (raw)
In-Reply-To: <1449802616-16170-3-git-send-email-namhyung@kernel.org>
Commit-ID: 448f13b2d18fdc8dbaada97442e8954dcb4ef8fa
Gitweb: http://git.kernel.org/tip/448f13b2d18fdc8dbaada97442e8954dcb4ef8fa
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Fri, 11 Dec 2015 11:56:55 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 11 Dec 2015 08:36:18 -0300
perf top: Fix annotation on --stdio
The ui__has_annotation() inside perf_top__record_precise_ip() should be
removed since it returns true only for TUI (and when sort key has
symbol). However the 'perf top --stdio' also supports annotation for a
symbol which was specified by 's' key action.
Actually it already does the necessary checks before calling the
function. So it's ok to get rid of the check here.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1449802616-16170-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-top.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 586798a..f447e55 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -189,8 +189,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,
if (pthread_mutex_trylock(¬es->lock))
return;
- if (ui__has_annotation())
- err = hist_entry__inc_addr_samples(he, counter, ip);
+ err = hist_entry__inc_addr_samples(he, counter, ip);
pthread_mutex_unlock(¬es->lock);
next prev parent reply other threads:[~2015-12-14 8:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-11 2:56 [PATCH 1/4] perf top: Do not convert address for perf_top__record_precise_ip() Namhyung Kim
2015-12-11 2:56 ` [PATCH 2/4] perf top: Access hists->lock only if needed Namhyung Kim
2015-12-14 8:36 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-12-11 2:56 ` [PATCH 3/4] perf top: Fix annotation on --stdio Namhyung Kim
2015-12-14 8:37 ` tip-bot for Namhyung Kim [this message]
2015-12-11 2:56 ` [PATCH 4/4] perf top: Cleanup condition in perf_top__record_precise_ip() Namhyung Kim
2015-12-11 11:37 ` Arnaldo Carvalho de Melo
2015-12-14 8:37 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-12-11 11:39 ` [PATCH 1/4] perf top: Do not convert address for perf_top__record_precise_ip() Arnaldo Carvalho de Melo
2015-12-14 8:36 ` [tip:perf/core] " tip-bot for Namhyung Kim
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-448f13b2d18fdc8dbaada97442e8954dcb4ef8fa@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--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 \
/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