From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
eranian@google.com, paulus@samba.org, hpa@zytor.com,
mingo@kernel.org, peterz@infradead.org, efault@gmx.de,
namhyung@gmail.com, jolsa@redhat.com, fweisbec@gmail.com,
adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de
Subject: [tip:perf/core] perf tools: Remove filter parameter of thread__find_addr_location()
Date: Thu, 15 Aug 2013 00:57:22 -0700 [thread overview]
Message-ID: <tip-61710bdee324aab1c148c8573ee49cea59d05874@git.kernel.org> (raw)
In-Reply-To: <1375961547-30267-8-git-send-email-adrian.hunter@intel.com>
Commit-ID: 61710bdee324aab1c148c8573ee49cea59d05874
Gitweb: http://git.kernel.org/tip/61710bdee324aab1c148c8573ee49cea59d05874
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Thu, 8 Aug 2013 14:32:26 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 12 Aug 2013 10:31:12 -0300
perf tools: Remove filter parameter of thread__find_addr_location()
Now that the symbol filter is recorded on the machine there is no need
to pass it to thread__find_addr_location(). So remove it.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375961547-30267-8-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 9 +++++----
tools/perf/util/machine.c | 8 ++++----
tools/perf/util/thread.h | 3 +--
tools/perf/util/unwind.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index f3cf771..9d301c9 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -670,12 +670,13 @@ try_again:
void thread__find_addr_location(struct thread *thread, struct machine *machine,
u8 cpumode, enum map_type type, u64 addr,
- struct addr_location *al,
- symbol_filter_t filter)
+ struct addr_location *al)
{
- thread__find_addr_map(thread, machine, cpumode, type, addr, al, filter);
+ thread__find_addr_map(thread, machine, cpumode, type, addr, al,
+ machine->symbol_filter);
if (al->map != NULL)
- al->sym = map__find_symbol(al->map, al->addr, filter);
+ al->sym = map__find_symbol(al->map, al->addr,
+ machine->symbol_filter);
else
al->sym = NULL;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 4c7e0a28..4514e7e 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1130,7 +1130,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread,
* or else, the symbol is unknown
*/
thread__find_addr_location(thread, machine, m, MAP__FUNCTION,
- ip, &al, NULL);
+ ip, &al);
if (al.sym)
goto found;
}
@@ -1148,8 +1148,8 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread,
memset(&al, 0, sizeof(al));
- thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr, &al,
- NULL);
+ thread__find_addr_location(thread, machine, m, MAP__VARIABLE, addr,
+ &al);
ams->addr = addr;
ams->al_addr = al.addr;
ams->sym = al.sym;
@@ -1244,7 +1244,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
al.filtered = false;
thread__find_addr_location(thread, machine, cpumode,
- MAP__FUNCTION, ip, &al, NULL);
+ MAP__FUNCTION, ip, &al);
if (al.sym != NULL) {
if (sort__has_parent && !*parent &&
symbol__match_regex(al.sym, &parent_regex))
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index f98d1d9..0ab47d8 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -45,8 +45,7 @@ void thread__find_addr_map(struct thread *thread, struct machine *machine,
void thread__find_addr_location(struct thread *thread, struct machine *machine,
u8 cpumode, enum map_type type, u64 addr,
- struct addr_location *al,
- symbol_filter_t filter);
+ struct addr_location *al);
static inline void *thread__priv(struct thread *thread)
{
diff --git a/tools/perf/util/unwind.c b/tools/perf/util/unwind.c
index 5bbd494..abac3f9 100644
--- a/tools/perf/util/unwind.c
+++ b/tools/perf/util/unwind.c
@@ -473,7 +473,7 @@ static int entry(u64 ip, struct thread *thread, struct machine *machine,
thread__find_addr_location(thread, machine,
PERF_RECORD_MISC_USER,
- MAP__FUNCTION, ip, &al, NULL);
+ MAP__FUNCTION, ip, &al);
e.ip = ip;
e.map = al.map;
next prev parent reply other threads:[~2013-08-15 7:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 11:32 [PATCH 0/8] perf tools: add symbol filter to struct machine Adrian Hunter
2013-08-08 11:32 ` [PATCH 1/8] " Adrian Hunter
2013-08-15 7:56 ` [tip:perf/core] perf machine: Add " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 2/8] perf top: set the machines symbol filter Adrian Hunter
2013-08-15 7:56 ` [tip:perf/core] perf top: Set " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 3/8] perf report: set " Adrian Hunter
2013-08-15 7:56 ` [tip:perf/core] perf report: Set " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 4/8] perf mem: remove unused symbol filter member Adrian Hunter
2013-08-15 7:56 ` [tip:perf/core] perf mem: Remove " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 5/8] perf annotate: set the machines symbol filter Adrian Hunter
2013-08-15 7:57 ` [tip:perf/core] perf annotate: Set " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 6/8] perf tools: remove filter parameter of perf_event__preprocess_sample() Adrian Hunter
2013-08-15 7:57 ` [tip:perf/core] perf tools: Remove " tip-bot for Adrian Hunter
2013-08-08 11:32 ` [PATCH 7/8] perf tools: remove filter parameter of thread__find_addr_location() Adrian Hunter
2013-08-15 7:57 ` tip-bot for Adrian Hunter [this message]
2013-08-08 11:32 ` [PATCH 8/8] perf tools: remove filter parameter of thread__find_addr_map() Adrian Hunter
2013-08-15 7:57 ` [tip:perf/core] perf tools: Remove " tip-bot for Adrian Hunter
2013-08-08 16:00 ` [PATCH 0/8] perf tools: add symbol filter to struct machine Arnaldo Carvalho de Melo
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-61710bdee324aab1c148c8573ee49cea59d05874@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@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@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.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