From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 09/10] perf events: Tidy up perf_event__preprocess_sample
Date: Tue, 20 Dec 2011 17:18:10 -0200 [thread overview]
Message-ID: <1324408691-28296-10-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1324408691-28296-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung@gmail.com>
Use local variable 'dso' to reduce typing a bit and rearrange the if
condition. Also NULL check of al->map in the condition is not necessary.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1323703017-6060-7-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 97c479b..b7c7f39 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -814,13 +814,14 @@ int perf_event__preprocess_sample(const union perf_event *event,
al->cpu = sample->cpu;
if (al->map) {
+ struct dso *dso = al->map->dso;
+
if (symbol_conf.dso_list &&
- (!al->map || !al->map->dso ||
- !(strlist__has_entry(symbol_conf.dso_list,
- al->map->dso->short_name) ||
- (al->map->dso->short_name != al->map->dso->long_name &&
- strlist__has_entry(symbol_conf.dso_list,
- al->map->dso->long_name)))))
+ (!dso || !(strlist__has_entry(symbol_conf.dso_list,
+ dso->short_name) ||
+ (dso->short_name != dso->long_name &&
+ strlist__has_entry(symbol_conf.dso_list,
+ dso->long_name)))))
goto out_filtered;
al->sym = map__find_symbol(al->map, al->addr, filter);
--
1.7.8.rc0.35.gee6df
next prev parent reply other threads:[~2011-12-20 19:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 19:18 [GIT PULL 00/10] perf/core improvements and fixes Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 01/10] perf record: Add ability to record event period Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 02/10] perf evsel: Fix uninitialized memory access to struct perf_sample Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 03/10] perf report: Document '--call-graph' for optional print_limit argument Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 04/10] perf evlist: Fix errno value reporting on failed mmap Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 05/10] perf symbols: Get rid of duplicated snprintf() Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 06/10] perf symbols: Fix error path on symbol__init() Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 07/10] perf tools: Fix a memory leak on perf_read_values_destroy Arnaldo Carvalho de Melo
2011-12-20 19:18 ` [PATCH 08/10] perf tools: Remove stale git headlines from top comment Arnaldo Carvalho de Melo
2011-12-20 19:18 ` Arnaldo Carvalho de Melo [this message]
2011-12-20 19:18 ` [PATCH 10/10] perf test: Add more automated tests for event parsing Arnaldo Carvalho de Melo
2011-12-20 19:33 ` [GIT PULL 00/10] 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=1324408691-28296-10-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@gmail.com \
--cc=paulus@samba.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 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).