All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@redhat.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 3/9] perf top: Fix annotation on --stdio
Date: Fri, 11 Dec 2015 11:22:26 -0300	[thread overview]
Message-ID: <1449843752-28395-4-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1449843752-28395-1-git-send-email-acme@kernel.org>

From: Namhyung Kim <namhyung@kernel.org>

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 586798acf7db..f447e5531f8b 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(&notes->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(&notes->lock);
 
-- 
2.1.0


  parent reply	other threads:[~2015-12-11 14:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-11 14:22 [GIT PULL 0/9] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 1/9] perf top: Do not convert address for perf_top__record_precise_ip() Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 2/9] perf top: Access hists->lock only if needed Arnaldo Carvalho de Melo
2015-12-11 14:22 ` Arnaldo Carvalho de Melo [this message]
2015-12-11 14:22 ` [PATCH 4/9] perf top: Cleanup condition in perf_top__record_precise_ip() Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 5/9] tools lib bpf: Check return value of strdup when reading map names Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 6/9] tools lib bpf: Fetch map names from correct strtab Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 7/9] perf data: Add u32_hex data type Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 8/9] perf script: Add support for PERF_TYPE_BREAKPOINT Arnaldo Carvalho de Melo
2015-12-11 14:22 ` [PATCH 9/9] perf tools: Clear struct machine during machine__init() Arnaldo Carvalho de Melo
2015-12-14  8:32 ` [GIT PULL 0/9] perf/core improvements and fixes Ingo Molnar

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=1449843752-28395-4-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.