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

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

perf hists: Introduce hists__for_each_format macro 



With the hist object having the perf_hpp_list we can now iterate output
format entries based in the hists object. Adding hists__for_each_format
macro to do that.

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


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

tools/perf/ui/browsers/hists.c

+4 −4
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, 


		hist_browser__gotorc(browser, row, 0);



		perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

		hists__for_each_format(browser->hists, fmt) {

			if (perf_hpp__should_skip(fmt, entry->hists) ||

			    column++ < browser->b.horiz_scroll)

				continue;
@@ -1175,7 +1175,7 @@ static int hists_browser__scnprintf_headers(struct hist_browser *browser, char * 
			return ret;

	}



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(browser->hists, fmt) {

		if (perf_hpp__should_skip(fmt, hists)  || column++ < browser->b.horiz_scroll)

			continue;
@@ -1441,7 +1441,7 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser, 
	if (symbol_conf.use_callchain)

		printed += fprintf(fp, "%c ", folded_sign);



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(browser->hists, fmt) {

		if (perf_hpp__should_skip(fmt, he->hists))

			continue;
@@ -2104,7 +2104,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
	memset(options, 0, sizeof(options));

	memset(actions, 0, sizeof(actions));



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(browser->hists, fmt) {

		perf_hpp__reset_width(fmt, hists);

		/*

		 * This is done just once, and activates the horizontal scrolling

tools/perf/ui/gtk/hists.c

+3 −3
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, 


	nr_cols = 0;



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt)

	hists__for_each_format(hists, fmt)

		col_types[nr_cols++] = G_TYPE_STRING;



	store = gtk_tree_store_newv(nr_cols, col_types);
@@ -317,7 +317,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, 


	col_idx = 0;



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(hists, fmt) {

		if (perf_hpp__should_skip(fmt, hists))

			continue;
@@ -367,7 +367,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, 


		col_idx = 0;



		perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

		hists__for_each_format(hists, fmt) {

			if (perf_hpp__should_skip(fmt, h->hists))

				continue;

tools/perf/ui/hist.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ unsigned int hists__sort_list_width(struct hists *hists) 
	bool first = true;

	struct perf_hpp dummy_hpp;



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(hists, fmt) {

		if (perf_hpp__should_skip(fmt, hists))

			continue;

tools/perf/ui/stdio/hist.c

+4 −4
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) 
	if (symbol_conf.exclude_other && !he->parent)

		return 0;



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(he->hists, fmt) {

		if (perf_hpp__should_skip(fmt, he->hists))

			continue;
@@ -453,7 +453,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, 


	init_rem_hits();



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt)

	hists__for_each_format(hists, fmt)

		perf_hpp__reset_width(fmt, hists);



	if (symbol_conf.col_width_list_str)
@@ -464,7 +464,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, 


	fprintf(fp, "# ");



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(hists, fmt) {

		if (perf_hpp__should_skip(fmt, hists))

			continue;
@@ -488,7 +488,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, 


	fprintf(fp, "# ");



	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	hists__for_each_format(hists, fmt) {

		unsigned int i;



		if (perf_hpp__should_skip(fmt, hists))

tools/perf/util/hist.h

+3 −0
Original line number Diff line number Diff line
@@ -261,6 +261,9 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format) 
#define perf_hpp_list__for_each_sort_list_safe(_list, format, tmp)	\

	list_for_each_entry_safe(format, tmp, &(_list)->sorts, sort_list)



#define hists__for_each_format(hists, format) \

	perf_hpp_list__for_each_format((hists)->hpp_list, fmt)



extern struct perf_hpp_fmt perf_hpp__format[];



enum {