From: Andi Kleen <andi@firstfloor.org>
To: jolsa@redhat.com
Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org,
acme@kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 01/10] perf, tools: Factor out adding new call chain entries
Date: Wed, 12 Nov 2014 18:05:19 -0800 [thread overview]
Message-ID: <1415844328-4884-2-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1415844328-4884-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Move the code to resolve and add a new callchain entry
into a new add_callchain_ip function. This will be used
in the next patches to add LBRs too.
No change in behavior.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/machine.c | 51 +++++++++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 19 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 52e9490..84390ee 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1381,6 +1381,34 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample,
return mi;
}
+static int add_callchain_ip(struct thread *thread,
+ struct symbol **parent,
+ struct addr_location *root_al,
+ int cpumode,
+ u64 ip)
+{
+ struct addr_location al;
+
+ al.filtered = 0;
+ al.sym = NULL;
+ thread__find_addr_location(thread, cpumode, MAP__FUNCTION,
+ ip, &al);
+ if (al.sym != NULL) {
+ if (sort__has_parent && !*parent &&
+ symbol__match_regex(al.sym, &parent_regex))
+ *parent = al.sym;
+ else if (have_ignore_callees && root_al &&
+ symbol__match_regex(al.sym, &ignore_callees_regex)) {
+ /* Treat this symbol as the root,
+ forgetting its callees. */
+ *root_al = al;
+ callchain_cursor_reset(&callchain_cursor);
+ }
+ }
+
+ return callchain_cursor_append(&callchain_cursor, ip, al.map, al.sym);
+}
+
struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
struct addr_location *al)
{
@@ -1427,7 +1455,6 @@ static int thread__resolve_callchain_sample(struct thread *thread,
for (i = 0; i < chain_nr; i++) {
u64 ip;
- struct addr_location al;
if (callchain_param.order == ORDER_CALLEE)
j = i;
@@ -1464,24 +1491,10 @@ static int thread__resolve_callchain_sample(struct thread *thread,
continue;
}
- al.filtered = 0;
- thread__find_addr_location(thread, cpumode,
- MAP__FUNCTION, ip, &al);
- if (al.sym != NULL) {
- if (sort__has_parent && !*parent &&
- symbol__match_regex(al.sym, &parent_regex))
- *parent = al.sym;
- else if (have_ignore_callees && root_al &&
- symbol__match_regex(al.sym, &ignore_callees_regex)) {
- /* Treat this symbol as the root,
- forgetting its callees. */
- *root_al = al;
- callchain_cursor_reset(&callchain_cursor);
- }
- }
-
- err = callchain_cursor_append(&callchain_cursor,
- ip, al.map, al.sym);
+ err = add_callchain_ip(thread, parent, root_al,
+ cpumode, ip);
+ if (err == -EINVAL)
+ break;
if (err)
return err;
}
--
1.9.3
next prev parent reply other threads:[~2014-11-13 2:05 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 2:05 Implement lbr-as-callgraph v10 Andi Kleen
2014-11-13 2:05 ` Andi Kleen [this message]
2014-11-13 19:14 ` [PATCH 01/10] perf, tools: Factor out adding new call chain entries Arnaldo Carvalho de Melo
2014-11-20 7:37 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 02/10] perf, tools: Support handling complete branch stacks as histograms Andi Kleen
2014-11-13 19:14 ` Arnaldo Carvalho de Melo
2014-11-13 19:52 ` Andi Kleen
2014-11-13 20:08 ` Arnaldo Carvalho de Melo
2014-11-13 20:15 ` Andi Kleen
2014-11-13 20:42 ` Arnaldo Carvalho de Melo
2014-12-08 6:53 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 03/10] perf, tools: Use al.addr to set up call chain Andi Kleen
2014-11-13 19:16 ` Arnaldo Carvalho de Melo
2014-12-11 21:46 ` Jiri Olsa
2014-12-11 22:27 ` Andi Kleen
2014-11-20 7:38 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 04/10] perf, tools: Add --branch-history option to report Andi Kleen
2014-12-08 6:53 ` [tip:perf/core] perf report: Add --branch-history option tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 05/10] perf, tools: Use a common function to resolve symbol or name Andi Kleen
2014-11-13 19:17 ` Arnaldo Carvalho de Melo
2014-11-20 7:38 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 06/10] perf, tools: Enable printing the srcline in the history Andi Kleen
2014-11-13 19:20 ` Arnaldo Carvalho de Melo
2014-12-08 6:48 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 07/10] perf, tools: Only print base source file for srcline Andi Kleen
2014-11-13 19:22 ` Arnaldo Carvalho de Melo
2014-11-20 7:38 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 08/10] perf, tools: Support source line numbers in annotate Andi Kleen
2014-11-13 20:52 ` Arnaldo Carvalho de Melo
2014-11-20 7:39 ` [tip:perf/core] perf annotate: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 09/10] tools, perf: Make get_srcline fall back to sym+offset Andi Kleen
2014-12-08 6:49 ` [tip:perf/core] perf callchain: " tip-bot for Andi Kleen
2014-11-13 2:05 ` [PATCH 10/10] tools, perf: Add asprintf replacement Andi Kleen
2014-11-13 20:53 ` Arnaldo Carvalho de Melo
2014-11-13 21:14 ` Andi Kleen
2014-11-17 21:34 ` Implement lbr-as-callgraph v10 Arnaldo Carvalho de Melo
2014-11-18 1:56 ` Andi Kleen
2014-11-18 10:44 ` Jiri Olsa
2014-11-18 11:00 ` Jiri Olsa
2014-11-18 13:37 ` Arnaldo Carvalho de Melo
2014-11-19 15:31 ` Andi Kleen
2014-11-19 6:21 ` Namhyung Kim
2014-11-19 9:23 ` Jiri Olsa
2014-11-19 10:54 ` Jiri Olsa
2014-11-19 14:10 ` Arnaldo Carvalho de Melo
2014-11-19 16:04 ` Arnaldo Carvalho de Melo
2014-11-19 21:48 ` Andi Kleen
2014-11-20 19:33 ` Arnaldo Carvalho de Melo
2014-11-20 20:46 ` Andi Kleen
2014-11-21 20:30 ` Arnaldo Carvalho de Melo
2014-11-22 1:25 ` Andi Kleen
2014-11-24 7:40 ` Namhyung Kim
2014-11-19 21:50 ` Andi Kleen
2014-11-20 20:36 ` 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=1415844328-4884-2-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.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 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).