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

perf hists: Introduce struct perf_hpp_list 



Gather output and sort lists under struct perf_hpp_list, so we could
have multiple instancies of sort/output format entries.

Replacing current perf_hpp__list and perf_hpp__sort_list lists with
single perf_hpp_list instance.

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-15-git-send-email-jolsa@kernel.org


[ Renamed fields to .{fields,sorts} as suggested by Namhyung and acked by Jiri ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6d3375ef

tools/perf/ui/hist.c

+6 −5
Original line number Diff line number Diff line
@@ -436,9 +436,10 @@ struct perf_hpp_fmt perf_hpp__format[] = { 
	HPP__PRINT_FNS("Period", period, PERIOD)

};



LIST_HEAD(perf_hpp__list);

LIST_HEAD(perf_hpp__sort_list);



struct perf_hpp_list perf_hpp_list = {

	.fields	= LIST_HEAD_INIT(perf_hpp_list.fields),

	.sorts	= LIST_HEAD_INIT(perf_hpp_list.sorts),

};



#undef HPP__COLOR_PRINT_FNS

#undef HPP__COLOR_ACC_PRINT_FNS
@@ -506,7 +507,7 @@ void perf_hpp__init(void) 


void perf_hpp__column_register(struct perf_hpp_fmt *format)

{

	list_add_tail(&format->list, &perf_hpp__list);

	list_add_tail(&format->list, &perf_hpp_list.fields);

}



void perf_hpp__column_unregister(struct perf_hpp_fmt *format)
@@ -516,7 +517,7 @@ void perf_hpp__column_unregister(struct perf_hpp_fmt *format) 


void perf_hpp__register_sort_field(struct perf_hpp_fmt *format)

{

	list_add_tail(&format->sort_list, &perf_hpp__sort_list);

	list_add_tail(&format->sort_list, &perf_hpp_list.sorts);

}



void perf_hpp__cancel_cumulate(void)

tools/perf/util/hist.h

+10 −6
Original line number Diff line number Diff line
@@ -226,20 +226,24 @@ struct perf_hpp_fmt { 
	int idx;

};



extern struct list_head perf_hpp__list;

extern struct list_head perf_hpp__sort_list;

struct perf_hpp_list {

	struct list_head fields;

	struct list_head sorts;

};



extern struct perf_hpp_list perf_hpp_list;



#define perf_hpp__for_each_format(format) \

	list_for_each_entry(format, &perf_hpp__list, list)

	list_for_each_entry(format, &perf_hpp_list.fields, list)



#define perf_hpp__for_each_format_safe(format, tmp)	\

	list_for_each_entry_safe(format, tmp, &perf_hpp__list, list)

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



#define perf_hpp__for_each_sort_list(format) \

	list_for_each_entry(format, &perf_hpp__sort_list, sort_list)

	list_for_each_entry(format, &perf_hpp_list.sorts, sort_list)



#define perf_hpp__for_each_sort_list_safe(format, tmp)	\

	list_for_each_entry_safe(format, tmp, &perf_hpp__sort_list, sort_list)

	list_for_each_entry_safe(format, tmp, &perf_hpp_list.sorts, sort_list)



extern struct perf_hpp_fmt perf_hpp__format[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE