Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a1799e0 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Introduce perf_hpp_list__for_each_format_safe macro 



Introducing perf_hpp_list__for_each_format_safe macro to iterate
perf_hpp_list object's output entries safely.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-21-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cf094045

tools/perf/ui/hist.c

+2 −2
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ void perf_hpp__cancel_cumulate(void) 
	ovh = &perf_hpp__format[PERF_HPP__OVERHEAD];

	acc = &perf_hpp__format[PERF_HPP__OVERHEAD_ACC];



	perf_hpp__for_each_format_safe(fmt, tmp) {

	perf_hpp_list__for_each_format_safe(&perf_hpp_list, fmt, tmp) {

		if (acc->equal(acc, fmt)) {

			perf_hpp__column_unregister(fmt);

			continue;
@@ -597,7 +597,7 @@ void perf_hpp__reset_output_field(void) 
	struct perf_hpp_fmt *fmt, *tmp;



	/* reset output fields */

	perf_hpp__for_each_format_safe(fmt, tmp) {

	perf_hpp_list__for_each_format_safe(&perf_hpp_list, fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

		fmt_free(fmt);

tools/perf/util/hist.h

+2 −2
Original line number Diff line number Diff line
@@ -251,8 +251,8 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format) 
#define perf_hpp_list__for_each_format(_list, format) \

	list_for_each_entry(format, &(_list)->fields, list)



#define perf_hpp__for_each_format_safe(format, tmp)	\

	list_for_each_entry_safe(format, tmp, &perf_hpp_list.fields, list)

#define perf_hpp_list__for_each_format_safe(_list, format, tmp)	\

	list_for_each_entry_safe(format, tmp, &(_list)->fields, list)



#define perf_hpp__for_each_sort_list(format) \

	list_for_each_entry(format, &perf_hpp_list.sorts, sort_list)