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

Commit 1c89fe9b authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa
Browse files

perf tools: Introduce reset_output_field() 



The reset_output_field() function is for clearing output field
settings and will be used for test code in later patch.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-19-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent cfaa154b

tools/perf/ui/hist.c

+17 −0
Original line number Diff line number Diff line
@@ -459,6 +459,23 @@ void perf_hpp__append_sort_keys(void) 
	}

}



void perf_hpp__reset_output_field(void)

{

	struct perf_hpp_fmt *fmt, *tmp;



	/* reset output fields */

	perf_hpp__for_each_format_safe(fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

	}



	/* reset sort keys */

	perf_hpp__for_each_sort_list_safe(fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

	}

}



/*

 * See hists__fprintf to match the column widths

 */

tools/perf/util/hist.h

+7 −0
Original line number Diff line number Diff line
@@ -174,9 +174,15 @@ extern struct list_head perf_hpp__sort_list; 
#define perf_hpp__for_each_format(format) \

	list_for_each_entry(format, &perf_hpp__list, list)



#define perf_hpp__for_each_format_safe(format, tmp)	\

	list_for_each_entry_safe(format, tmp, &perf_hpp__list, list)



#define perf_hpp__for_each_sort_list(format) \

	list_for_each_entry(format, &perf_hpp__sort_list, 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)



extern struct perf_hpp_fmt perf_hpp__format[];



enum {
@@ -197,6 +203,7 @@ void perf_hpp__column_register(struct perf_hpp_fmt *format); 
void perf_hpp__column_enable(unsigned col);

void perf_hpp__register_sort_field(struct perf_hpp_fmt *format);

void perf_hpp__setup_output_field(void);

void perf_hpp__reset_output_field(void);

void perf_hpp__append_sort_keys(void);



bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format);

tools/perf/util/sort.c

+11 −0
Original line number Diff line number Diff line
@@ -1573,3 +1573,14 @@ int setup_sorting(void) 


	return 0;

}



void reset_output_field(void)

{

	sort__need_collapse = 0;

	sort__has_parent = 0;

	sort__has_sym = 0;

	sort__has_dso = 0;



	reset_dimensions();

	perf_hpp__reset_output_field();

}

tools/perf/util/sort.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ extern struct list_head hist_entry__sort_list; 


int setup_sorting(void);

int setup_output_field(void);

void reset_output_field(void);

extern int sort_dimension__add(const char *);

void sort__setup_elide(FILE *fp);