From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756068AbaAHIsJ (ORCPT ); Wed, 8 Jan 2014 03:48:09 -0500 Received: from lgeamrelo01.lge.com ([156.147.1.125]:47900 "EHLO LGEAMRELO01.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755861AbaAHIqn (ORCPT ); Wed, 8 Jan 2014 03:46:43 -0500 X-AuditID: 9c93017d-b7b66ae000006a2a-0c-52cd106eb642 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Namhyung Kim , LKML , Arun Sharma , Frederic Weisbecker , Jiri Olsa , Rodrigo Campos Subject: [PATCH 09/28] perf tools: Update cpumode for each cumulative entry Date: Wed, 8 Jan 2014 17:46:14 +0900 Message-Id: <1389170793-21926-10-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1389170793-21926-1-git-send-email-namhyung@kernel.org> References: <1389170793-21926-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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. Cc: Arun Sharma Cc: Frederic Weisbecker Signed-off-by: Namhyung Kim --- tools/perf/builtin-report.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 27e477df0730..06330736485b 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -401,9 +401,35 @@ iter_next_cumulative_entry(struct hist_entry_iter *iter, else al->addr = node->ip; - if (iter->rep->hide_unresolved && al->sym == NULL) - return 0; + if (al->sym == NULL) { + if (iter->rep->hide_unresolved) + return 0; + if (al->map == NULL) + goto out; + } + + if (al->map->groups == &iter->machine->kmaps) { + if (machine__is_host(iter->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(iter->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: callchain_cursor_advance(&callchain_cursor); return 1; } -- 1.7.11.7