From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965590AbcBDMk7 (ORCPT ); Thu, 4 Feb 2016 07:40:59 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41883 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756593AbcBDMk5 (ORCPT ); Thu, 4 Feb 2016 07:40:57 -0500 Date: Thu, 4 Feb 2016 04:40:42 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com Reply-To: jolsa@kernel.org, a.p.zijlstra@chello.nl, namhyung@kernel.org, acme@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1453109064-1026-23-git-send-email-jolsa@kernel.org> References: <1453109064-1026-23-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Introduce perf_hpp_list__for_each_sort_list_safe macro Git-Commit-ID: 1a8ebd243a0b65c2a6d1458705d04dece937ab52 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: 1a8ebd243a0b65c2a6d1458705d04dece937ab52 Gitweb: http://git.kernel.org/tip/1a8ebd243a0b65c2a6d1458705d04dece937ab52 Author: Jiri Olsa AuthorDate: Mon, 18 Jan 2016 10:24:20 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 3 Feb 2016 12:24:16 -0300 perf hists: Introduce perf_hpp_list__for_each_sort_list_safe macro Introducing perf_hpp_list__for_each_sort_list_safe macro to iterate perf_hpp_list object's sort entries safely. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1453109064-1026-23-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/hist.c | 2 +- tools/perf/util/hist.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index f09eabe..9cda51e 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -604,7 +604,7 @@ void perf_hpp__reset_output_field(void) } /* reset sort keys */ - perf_hpp__for_each_sort_list_safe(fmt, tmp) { + perf_hpp_list__for_each_sort_list_safe(&perf_hpp_list, fmt, tmp) { list_del_init(&fmt->list); list_del_init(&fmt->sort_list); fmt_free(fmt); diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index c9b2ea4..61d35a9 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -257,8 +257,8 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format) #define perf_hpp_list__for_each_sort_list(_list, format) \ list_for_each_entry(format, &(_list)->sorts, sort_list) -#define perf_hpp__for_each_sort_list_safe(format, tmp) \ - list_for_each_entry_safe(format, tmp, &perf_hpp_list.sorts, sort_list) +#define perf_hpp_list__for_each_sort_list_safe(_list, format, tmp) \ + list_for_each_entry_safe(format, tmp, &(_list)->sorts, sort_list) extern struct perf_hpp_fmt perf_hpp__format[];