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

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

perf hists: Add struct perf_hpp_list argument to helper functions 



Adding struct perf_hpp_list argument to following helper functions:

  void perf_hpp__setup_output_field(struct perf_hpp_list *list);
  void perf_hpp__reset_output_field(struct perf_hpp_list *list);
  void perf_hpp__append_sort_keys(struct perf_hpp_list *list);

so they could be used on hists's hpp_list.

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


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

tools/perf/ui/hist.c

+10 −9
Original line number Diff line number Diff line
@@ -548,15 +548,15 @@ static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b) 
	return a->equal && a->equal(a, b);

}



void perf_hpp__setup_output_field(void)

void perf_hpp__setup_output_field(struct perf_hpp_list *list)

{

	struct perf_hpp_fmt *fmt;



	/* append sort keys to output field */

	perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {

	perf_hpp_list__for_each_sort_list(list, fmt) {

		struct perf_hpp_fmt *pos;



		perf_hpp_list__for_each_format(&perf_hpp_list, pos) {

		perf_hpp_list__for_each_format(list, pos) {

			if (fmt_equal(fmt, pos))

				goto next;

		}
@@ -567,15 +567,15 @@ void perf_hpp__setup_output_field(void) 
	}

}



void perf_hpp__append_sort_keys(void)

void perf_hpp__append_sort_keys(struct perf_hpp_list *list)

{

	struct perf_hpp_fmt *fmt;



	/* append output fields to sort keys */

	perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {

	perf_hpp_list__for_each_format(list, fmt) {

		struct perf_hpp_fmt *pos;



		perf_hpp_list__for_each_sort_list(&perf_hpp_list, pos) {

		perf_hpp_list__for_each_sort_list(list, pos) {

			if (fmt_equal(fmt, pos))

				goto next;

		}
@@ -586,25 +586,26 @@ void perf_hpp__append_sort_keys(void) 
	}

}





static void fmt_free(struct perf_hpp_fmt *fmt)

{

	if (fmt->free)

		fmt->free(fmt);

}



void perf_hpp__reset_output_field(void)

void perf_hpp__reset_output_field(struct perf_hpp_list *list)

{

	struct perf_hpp_fmt *fmt, *tmp;



	/* reset output fields */

	perf_hpp_list__for_each_format_safe(&perf_hpp_list, fmt, tmp) {

	perf_hpp_list__for_each_format_safe(list, fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

		fmt_free(fmt);

	}



	/* reset sort keys */

	perf_hpp_list__for_each_sort_list_safe(&perf_hpp_list, fmt, tmp) {

	perf_hpp_list__for_each_sort_list_safe(list, fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

		fmt_free(fmt);

tools/perf/util/hist.h

+4 −3
Original line number Diff line number Diff line
@@ -279,9 +279,10 @@ enum { 
void perf_hpp__init(void);

void perf_hpp__column_unregister(struct perf_hpp_fmt *format);

void perf_hpp__cancel_cumulate(void);

void perf_hpp__setup_output_field(void);

void perf_hpp__reset_output_field(void);

void perf_hpp__append_sort_keys(void);

void perf_hpp__setup_output_field(struct perf_hpp_list *list);

void perf_hpp__reset_output_field(struct perf_hpp_list *list);

void perf_hpp__append_sort_keys(struct perf_hpp_list *list);





bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format);

bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *format);

tools/perf/util/sort.c

+3 −3
Original line number Diff line number Diff line
@@ -2636,9 +2636,9 @@ int setup_sorting(struct perf_evlist *evlist) 
		return err;



	/* copy sort keys to output fields */

	perf_hpp__setup_output_field();

	perf_hpp__setup_output_field(&perf_hpp_list);

	/* and then copy output fields to sort keys */

	perf_hpp__append_sort_keys();

	perf_hpp__append_sort_keys(&perf_hpp_list);



	return 0;

}
@@ -2654,5 +2654,5 @@ void reset_output_field(void) 
	sort_order = NULL;



	reset_dimensions();

	perf_hpp__reset_output_field();

	perf_hpp__reset_output_field(&perf_hpp_list);

}