From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-perf-users@vger.kernel.org,
linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 3/3] perf, tools, report: Set up samples correctly in hierarchy mode
Date: Mon, 11 Mar 2019 20:52:24 -0700 [thread overview]
Message-ID: <20190312035224.30350-4-andi@firstfloor.org> (raw)
In-Reply-To: <20190312035224.30350-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
In hierarchy mode the res samples need to be cloned from the parent
entry. Copy them in this case. This fixes res sample browsing
with --hierarchy.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/hist.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 1f230285d78a..dcf24581dfbd 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -437,8 +437,15 @@ static int hist_entry__init(struct hist_entry *he,
}
if (symbol_conf.res_sample) {
- he->res_samples = calloc(sizeof(struct res_sample),
- symbol_conf.res_sample);
+ if (he->res_samples) {
+ he->res_samples = memdup(he->res_samples,
+ sizeof(struct res_sample) *
+ symbol_conf.res_sample);
+ } else {
+ he->res_samples = calloc(sizeof(struct res_sample),
+ symbol_conf.res_sample);
+ he->num_res = 0;
+ }
if (!he->res_samples)
goto err_srcline;
}
--
2.20.1
next prev parent reply other threads:[~2019-03-12 3:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 3:52 Some bug fixes to the res sample / script code Andi Kleen
2019-03-12 3:52 ` [PATCH 1/3] perf, tools, report: Handle samples without time Andi Kleen
2019-03-12 11:14 ` Jiri Olsa
2019-03-12 3:52 ` [PATCH 2/3] perf, tools, report: Pass on -f to child perf script Andi Kleen
2019-03-12 11:13 ` Jiri Olsa
2019-03-12 3:52 ` Andi Kleen [this message]
2019-03-12 11:12 ` [PATCH 3/3] perf, tools, report: Set up samples correctly in hierarchy mode Jiri Olsa
2019-03-12 13:52 ` Andi Kleen
2019-03-13 9:13 ` 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=20190312035224.30350-4-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.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