From: Andi Kleen <andi@firstfloor.org>
To: acme@infradead.org
Cc: jolsa@redhat.com, namhyung@kernel.org, mingo@kernel.org,
dsahern@gmail.com, fweisbec@gmail.com, adrian.hunter@intel.com,
linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 6/9] perf, tools: Fix max stack handling with lbr-as-callgraph
Date: Sat, 11 Jan 2014 11:42:56 -0800 [thread overview]
Message-ID: <1389469379-13340-7-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1389469379-13340-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
The original lbr-as-callstack code ignored the maxium callgraph
length set by the user. Fix this.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/machine.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 4032634..853639c 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1372,7 +1372,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
}
if (callchain_param.branch_callstack) {
- int nr = branch->nr;
+ int nr = min(max_stack, branch->nr);
struct branch_entry be[nr];
for (i = 0; i < nr; i++) {
@@ -1397,6 +1397,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
if (err)
return err;
}
+ chain_nr -= nr;
}
if (chain->nr > PERF_MAX_STACK_DEPTH) {
--
1.8.3.1
next prev parent reply other threads:[~2014-01-11 19:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-11 19:42 perf: Implement lbr-as-callgraph v2 Andi Kleen
2014-01-11 19:42 ` [PATCH 1/9] perf, tools: fix BFD detection on opensuse Andi Kleen
2014-01-12 15:16 ` Jiri Olsa
2014-01-13 9:03 ` Namhyung Kim
2014-01-12 15:40 ` David Ahern
2014-03-02 8:57 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2014-01-11 19:42 ` [PATCH 2/9] perf, tools: Support handling complete branch stacks as histograms Andi Kleen
2014-01-11 19:42 ` [PATCH 3/9] perf, tools: Add --branch-history option to report v2 Andi Kleen
2014-01-11 19:42 ` [PATCH 4/9] perf, tools: Filter out small loops from LBR-as-call-stack Andi Kleen
2014-01-11 19:42 ` [PATCH 5/9] perf, tools: Enable printing the srcline in the history Andi Kleen
2014-01-11 19:42 ` Andi Kleen [this message]
2014-01-11 19:42 ` [PATCH 7/9] perf, tools: Add overlap detection for report branch-call-stack mode Andi Kleen
2014-01-11 19:42 ` [PATCH 8/9] perf, tools: Only print base source file for srcline Andi Kleen
2014-01-11 19:42 ` [PATCH 9/9] perf, tools: Support source line numbers in annotate Andi Kleen
2014-01-12 15:16 ` perf: Implement lbr-as-callgraph v2 Jiri Olsa
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=1389469379-13340-7-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@infradead.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome