From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935417AbcCKIs5 (ORCPT ); Fri, 11 Mar 2016 03:48:57 -0500 Received: from torg.zytor.com ([198.137.202.12]:33316 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964845AbcCKIso (ORCPT ); Fri, 11 Mar 2016 03:48:44 -0500 Date: Fri, 11 Mar 2016 00:48:01 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, wangnan0@huawei.com, andi@firstfloor.org, mingo@kernel.org, peterz@infradead.org, dsahern@gmail.com, jolsa@kernel.org, eranian@google.com, tglx@linutronix.de Reply-To: jolsa@kernel.org, dsahern@gmail.com, peterz@infradead.org, mingo@kernel.org, andi@firstfloor.org, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com, wangnan0@huawei.com, namhyung@kernel.org In-Reply-To: <1457531222-18130-2-git-send-email-namhyung@kernel.org> References: <1457531222-18130-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix hist_entry__filter() for hierarchy Git-Commit-ID: f4954cfb1cda4cf0abf36d23213c702e94666c3f 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: f4954cfb1cda4cf0abf36d23213c702e94666c3f Gitweb: http://git.kernel.org/tip/f4954cfb1cda4cf0abf36d23213c702e94666c3f Author: Namhyung Kim AuthorDate: Wed, 9 Mar 2016 22:46:56 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 10 Mar 2016 16:45:36 -0300 perf tools: Fix hist_entry__filter() for hierarchy When hierarchy mode is enabled each output format is in a separate hpp list. So when applying a filter it should check all formats in the list. Currently it only checks a single ->fmt field which was not set properly. Signed-off-by: Namhyung Kim Tested-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1457531222-18130-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/sort.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 59a101e..8a49a07 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1602,16 +1602,30 @@ int hist_entry__filter(struct hist_entry *he, int type, const void *arg) { struct perf_hpp_fmt *fmt; struct hpp_sort_entry *hse; + int ret = -1; + int r; - fmt = he->fmt; - if (fmt == NULL || !perf_hpp__is_sort_entry(fmt)) - return -1; + perf_hpp_list__for_each_format(he->hpp_list, fmt) { + if (!perf_hpp__is_sort_entry(fmt)) + continue; - hse = container_of(fmt, struct hpp_sort_entry, hpp); - if (hse->se->se_filter == NULL) - return -1; + hse = container_of(fmt, struct hpp_sort_entry, hpp); + if (hse->se->se_filter == NULL) + continue; - return hse->se->se_filter(he, type, arg); + /* + * hist entry is filtered if any of sort key in the hpp list + * is applied. But it should skip non-matched filter types. + */ + r = hse->se->se_filter(he, type, arg); + if (r >= 0) { + if (ret < 0) + ret = 0; + ret |= r; + } + } + + return ret; } static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd,