From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>, Paul Mackerras <paulus@samba.org>,
Namhyung Kim <namhyung.kim@lge.com>,
LKML <linux-kernel@vger.kernel.org>, Arun Sharma <asharma@fb.com>,
Jiri Olsa <jolsa@redhat.com>,
Rodrigo Campos <rodrigo@sdfg.com.ar>,
Andi Kleen <andi@firstfloor.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 05/21] perf tools: Update cpumode for each cumulative entry
Date: Thu, 23 Jan 2014 09:13:49 +0900 [thread overview]
Message-ID: <1390436045-16830-6-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1390436045-16830-1-git-send-email-namhyung@kernel.org>
The cpumode and level in struct addr_localtion was set for a sample
and but updated as cumulative callchains were added. This led to have
non-matching symbol and cpumode in the output.
Update it accordingly based on the fact whether the map is a part of
the kernel or not. This is a reverse of what thread__find_addr_map()
does.
Tested-by: Arun Sharma <asharma@fb.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/callchain.c | 42 ++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/callchain.h | 2 ++
tools/perf/util/hist.c | 13 ++-----------
3 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 8d9db454f1a9..ac658135079f 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -551,3 +551,45 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *samp
return 0;
return callchain_append(he->callchain, &callchain_cursor, sample->period);
}
+
+int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,
+ bool hide_unresolved)
+{
+ al->map = node->map;
+ al->sym = node->sym;
+ if (node->map)
+ al->addr = node->map->map_ip(node->map, node->ip);
+ else
+ al->addr = node->ip;
+
+ if (al->sym == NULL) {
+ if (hide_unresolved)
+ return 0;
+ if (al->map == NULL)
+ goto out;
+ }
+
+ if (al->map->groups == &al->machine->kmaps) {
+ if (machine__is_host(al->machine)) {
+ al->cpumode = PERF_RECORD_MISC_KERNEL;
+ al->level = 'k';
+ } else {
+ al->cpumode = PERF_RECORD_MISC_GUEST_KERNEL;
+ al->level = 'g';
+ }
+ } else {
+ if (machine__is_host(al->machine)) {
+ al->cpumode = PERF_RECORD_MISC_USER;
+ al->level = '.';
+ } else if (perf_guest) {
+ al->cpumode = PERF_RECORD_MISC_GUEST_USER;
+ al->level = 'u';
+ } else {
+ al->cpumode = PERF_RECORD_MISC_HYPERVISOR;
+ al->level = 'H';
+ }
+ }
+
+out:
+ return 1;
+}
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 8ad97e9b119f..66faae21370d 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -155,6 +155,8 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parent
struct perf_evsel *evsel, struct addr_location *al,
int max_stack);
int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample);
+int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,
+ bool hide_unresolved);
extern const char record_callchain_help[];
#endif /* __PERF_CALLCHAIN_H */
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 46402fbf4c0e..beb9f96e4e4f 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -739,18 +739,9 @@ iter_next_cumulative_entry(struct hist_entry_iter *iter,
if (node == NULL)
return 0;
- al->map = node->map;
- al->sym = node->sym;
- if (node->map)
- al->addr = node->map->map_ip(node->map, node->ip);
- else
- al->addr = node->ip;
-
- if (iter->hide_unresolved && al->sym == NULL)
- return 0;
-
callchain_cursor_advance(&callchain_cursor);
- return 1;
+
+ return fill_callchain_info(al, node, iter->hide_unresolved);
}
static int
--
1.7.11.7
next prev parent reply other threads:[~2014-01-23 0:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-23 0:13 [PATCHSET 00/24] perf tools: Add support to accumulate hist periods (v7) Namhyung Kim
2014-01-23 0:13 ` [PATCH 01/21] perf tools: Introduce struct hist_entry_iter Namhyung Kim
2014-01-23 14:44 ` Jiri Olsa
2014-01-27 5:41 ` Namhyung Kim
2014-01-27 8:49 ` Jiri Olsa
2014-01-23 14:56 ` Jiri Olsa
2014-01-27 5:45 ` Namhyung Kim
2014-01-23 0:13 ` [PATCH 02/21] perf hists: Add support for accumulated stat of hist entry Namhyung Kim
2014-01-23 0:13 ` [PATCH 03/21] perf hists: Check if accumulated when adding a " Namhyung Kim
2014-01-23 0:13 ` [PATCH 04/21] perf hists: Accumulate hist entry stat based on the callchain Namhyung Kim
2014-01-23 0:13 ` Namhyung Kim [this message]
2014-01-23 0:13 ` [PATCH 06/21] perf report: Cache cumulative callchains Namhyung Kim
2014-01-23 0:13 ` [PATCH 07/21] perf callchain: Add callchain_cursor_snapshot() Namhyung Kim
2014-01-23 0:13 ` [PATCH 08/21] perf tools: Save callchain info for each cumulative entry Namhyung Kim
2014-01-23 0:13 ` [PATCH 09/21] perf hists: Sort hist entries by accumulated period Namhyung Kim
2014-01-23 0:13 ` [PATCH 10/21] perf ui/hist: Add support to accumulated hist stat Namhyung Kim
2014-01-23 0:13 ` [PATCH 11/21] perf ui/browser: " Namhyung Kim
2014-01-23 0:13 ` [PATCH 12/21] perf ui/gtk: " Namhyung Kim
2014-01-23 0:13 ` [PATCH 13/21] perf tools: Apply percent-limit to cumulative percentage Namhyung Kim
2014-01-23 0:13 ` [PATCH 14/21] perf tools: Add more hpp helper functions Namhyung Kim
2014-01-23 0:13 ` [PATCH 15/21] perf report: Add --children option Namhyung Kim
2014-01-23 0:14 ` [PATCH 16/21] perf report: Add report.children config option Namhyung Kim
2014-01-23 0:14 ` [PATCH 17/21] perf tools: Add callback function to hist_entry_iter Namhyung Kim
2014-01-23 0:14 ` [PATCH 18/21] perf top: Convert " Namhyung Kim
2014-01-23 0:14 ` [PATCH 19/21] perf top: Add --children option Namhyung Kim
2014-01-23 0:14 ` [PATCH 20/21] perf top: Add top.children config option Namhyung Kim
2014-01-23 0:14 ` [PATCH 21/21] perf tools: Enable --children option by default Namhyung Kim
2014-01-23 16:22 ` [PATCHSET 00/24] perf tools: Add support to accumulate hist periods (v7) Jiri Olsa
2014-01-27 6:22 ` Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2014-02-07 1:35 [PATCHSET 00/21] perf tools: Add support to accumulate hist periods (v8) Namhyung Kim
2014-02-07 1:35 ` [PATCH 05/21] perf tools: Update cpumode for each cumulative entry Namhyung Kim
2014-03-20 5:36 [PATCHSET 00/21] perf tools: Add support to accumulate hist periods (v9) Namhyung Kim
2014-03-20 5:36 ` [PATCH 05/21] perf tools: Update cpumode for each cumulative entry Namhyung Kim
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=1390436045-16830-6-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=andi@firstfloor.org \
--cc=asharma@fb.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
--cc=rodrigo@sdfg.com.ar \
/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