perf hists: Introduce perf_hpp_list__for_each_format macro
Introducing perf_hpp_list__for_each_format macro to iterate perf_hpp_list object's output entries. Signed-off-by: Jiri 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-20-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
							parent
							
								
									07600027fb
								
							
						
					
					
						commit
						cf094045d7
					
				| @ -1095,7 +1095,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, | ||||
| 
 | ||||
| 		hist_browser__gotorc(browser, row, 0); | ||||
| 
 | ||||
| 		perf_hpp__for_each_format(fmt) { | ||||
| 		perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		perf_hpp__reset_width(fmt, hists); | ||||
| 		/*
 | ||||
| 		 * This is done just once, and activates the horizontal scrolling | ||||
|  | ||||
| @ -306,7 +306,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, | ||||
| 
 | ||||
| 	nr_cols = 0; | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 		perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 			if (perf_hpp__should_skip(fmt, h->hists)) | ||||
| 				continue; | ||||
| 
 | ||||
|  | ||||
| @ -556,7 +556,7 @@ void perf_hpp__setup_output_field(void) | ||||
| 	perf_hpp__for_each_sort_list(fmt) { | ||||
| 		struct perf_hpp_fmt *pos; | ||||
| 
 | ||||
| 		perf_hpp__for_each_format(pos) { | ||||
| 		perf_hpp_list__for_each_format(&perf_hpp_list, pos) { | ||||
| 			if (fmt_equal(fmt, pos)) | ||||
| 				goto next; | ||||
| 		} | ||||
| @ -572,7 +572,7 @@ void perf_hpp__append_sort_keys(void) | ||||
| 	struct perf_hpp_fmt *fmt; | ||||
| 
 | ||||
| 	/* append output fields to sort keys */ | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		struct perf_hpp_fmt *pos; | ||||
| 
 | ||||
| 		perf_hpp__for_each_sort_list(pos) { | ||||
| @ -621,7 +621,7 @@ unsigned int hists__sort_list_width(struct hists *hists) | ||||
| 	bool first = true; | ||||
| 	struct perf_hpp dummy_hpp; | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		if (perf_hpp__should_skip(fmt, hists)) | ||||
| 			continue; | ||||
| 
 | ||||
| @ -674,7 +674,7 @@ void perf_hpp__set_user_width(const char *width_list_str) | ||||
| 	struct perf_hpp_fmt *fmt; | ||||
| 	const char *ptr = width_list_str; | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		char *p; | ||||
| 
 | ||||
| 		int len = strtol(ptr, &p, 10); | ||||
|  | ||||
| @ -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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, 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__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		unsigned int i; | ||||
| 
 | ||||
| 		if (perf_hpp__should_skip(fmt, hists)) | ||||
|  | ||||
| @ -248,8 +248,8 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format) | ||||
| 	perf_hpp_list__register_sort_field(&perf_hpp_list, format); | ||||
| } | ||||
| 
 | ||||
| #define perf_hpp__for_each_format(format) \ | ||||
| 	list_for_each_entry(format, &perf_hpp_list.fields, list) | ||||
| #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) | ||||
|  | ||||
| @ -2407,7 +2407,7 @@ void perf_hpp__set_elide(int idx, bool elide) | ||||
| 	struct perf_hpp_fmt *fmt; | ||||
| 	struct hpp_sort_entry *hse; | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		if (!perf_hpp__is_sort_entry(fmt)) | ||||
| 			continue; | ||||
| 
 | ||||
| @ -2467,7 +2467,7 @@ void sort__setup_elide(FILE *output) | ||||
| 	struct perf_hpp_fmt *fmt; | ||||
| 	struct hpp_sort_entry *hse; | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		if (!perf_hpp__is_sort_entry(fmt)) | ||||
| 			continue; | ||||
| 
 | ||||
| @ -2479,7 +2479,7 @@ void sort__setup_elide(FILE *output) | ||||
| 	 * It makes no sense to elide all of sort entries. | ||||
| 	 * Just revert them to show up again. | ||||
| 	 */ | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		if (!perf_hpp__is_sort_entry(fmt)) | ||||
| 			continue; | ||||
| 
 | ||||
| @ -2487,7 +2487,7 @@ void sort__setup_elide(FILE *output) | ||||
| 			return; | ||||
| 	} | ||||
| 
 | ||||
| 	perf_hpp__for_each_format(fmt) { | ||||
| 	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) { | ||||
| 		if (!perf_hpp__is_sort_entry(fmt)) | ||||
| 			continue; | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user