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

Groups > linux.kernel > #1289078

[PATCH 4/4] perf top: Cleanup condition in perf_top__record_precise_ip()

Show all headers | View raw

The 'he' cannot be NULL since it's caller hist_iter__top_callback() is
called only if iter->he is not NULL (see hist_entry_iter__add).  So
setting 'sym' before the condition to simplify the code.

Also make it clearer that the top->symbol_filter_entry check is only
meaningful on stdio mode (i.e. when use_browser is 0).

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/builtin-top.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index f447e5531f8b..e67991eb9304 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -175,15 +175,14 @@ static void perf_top__record_precise_ip(struct perf_top *top,
 					int counter, u64 ip)
 {
 	struct annotation *notes;
-	struct symbol *sym;
+	struct symbol *sym = he->ms.sym;
 	int err = 0;
 
-	if (he == NULL || he->ms.sym == NULL ||
-	    ((top->sym_filter_entry == NULL ||
-	      top->sym_filter_entry->ms.sym != he->ms.sym) && use_browser != 1))
+	if (sym == NULL || (use_browser == 0 &&
+			    (top->sym_filter_entry == NULL ||
+			     top->sym_filter_entry->ms.sym != he->ms.sym)))
 		return;
 
-	sym = he->ms.sym;
 	notes = symbol__annotation(sym);
 
 	if (pthread_mutex_trylock(&notes->lock))
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCH 1/4] perf top: Do not convert address for perf_top__record_precise_ip() Namhyung Kim <namhyung@kernel.org> - 2015-12-11 04:00 +0100
  [PATCH 3/4] perf top: Fix annotation on --stdio Namhyung Kim <namhyung@kernel.org> - 2015-12-11 04:00 +0100
  [PATCH 4/4] perf top: Cleanup condition in perf_top__record_precise_ip() Namhyung Kim <namhyung@kernel.org> - 2015-12-11 04:00 +0100
    Re: [PATCH 4/4] perf top: Cleanup condition in  perf_top__record_precise_ip() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-11 12:40 +0100
  Re: [PATCH 1/4] perf top: Do not convert address for  perf_top__record_precise_ip() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-11 12:40 +0100

csiph-web