From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992447AbcB0Jnj (ORCPT ); Sat, 27 Feb 2016 04:43:39 -0500 Received: from torg.zytor.com ([198.137.202.12]:39304 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756410AbcB0Jng (ORCPT ); Sat, 27 Feb 2016 04:43:36 -0500 Date: Sat, 27 Feb 2016 01:43:01 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: eranian@google.com, tglx@linutronix.de, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, andi@firstfloor.org, acme@redhat.com, wangnan0@huawei.com, peterz@infradead.org Reply-To: hpa@zytor.com, tglx@linutronix.de, eranian@google.com, dsahern@gmail.com, andi@firstfloor.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org, peterz@infradead.org, wangnan0@huawei.com, acme@redhat.com In-Reply-To: <1456512767-1164-1-git-send-email-namhyung@kernel.org> References: <1456512767-1164-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Fix comparing of dynamic entries Git-Commit-ID: 84b6ee8ea36ff797afa13c297a86ed0144482bee X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 84b6ee8ea36ff797afa13c297a86ed0144482bee Gitweb: http://git.kernel.org/tip/84b6ee8ea36ff797afa13c297a86ed0144482bee Author: Namhyung Kim AuthorDate: Sat, 27 Feb 2016 03:52:43 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 26 Feb 2016 18:35:57 -0300 perf hists: Fix comparing of dynamic entries When hist_entry__cmp() and hist_entry__collapse() are called, they should check if the dynamic entry is comparing matching hists only. Otherwise it might access different hists resulting in incorrect output. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1456512767-1164-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 75dc41d..cc849d3 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1002,6 +1002,10 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) int64_t cmp = 0; hists__for_each_sort_list(hists, fmt) { + if (perf_hpp__is_dynamic_entry(fmt) && + !perf_hpp__defined_dynamic_entry(fmt, hists)) + continue; + cmp = fmt->cmp(fmt, left, right); if (cmp) break; @@ -1018,6 +1022,10 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) int64_t cmp = 0; hists__for_each_sort_list(hists, fmt) { + if (perf_hpp__is_dynamic_entry(fmt) && + !perf_hpp__defined_dynamic_entry(fmt, hists)) + continue; + cmp = fmt->collapse(fmt, left, right); if (cmp) break;