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

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

perf hists: Add 'equal' method to perf_hpp_fmt struct 



To easily compare format entries and make it available for all kinds of
format entries.

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


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

tools/perf/ui/hist.c

+7 −2
Original line number Diff line number Diff line
@@ -524,6 +524,11 @@ void perf_hpp__cancel_cumulate(void) 
	perf_hpp__format[PERF_HPP__OVERHEAD].name = "Overhead";

}



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)

{

	struct perf_hpp_fmt *fmt;
@@ -542,7 +547,7 @@ void perf_hpp__setup_output_field(void) 
			struct perf_hpp_fmt *pos;



			perf_hpp__for_each_format(pos) {

				if (perf_hpp__same_sort_entry(pos, fmt))

				if (fmt_equal(fmt, pos))

					goto next;

			}

		}
@@ -571,7 +576,7 @@ void perf_hpp__append_sort_keys(void) 
			struct perf_hpp_fmt *pos;



			perf_hpp__for_each_sort_list(pos) {

				if (perf_hpp__same_sort_entry(pos, fmt))

				if (fmt_equal(fmt, pos))

					goto next;

			}

		}

tools/perf/util/hist.h

+1 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ struct perf_hpp_fmt { 
			    struct hist_entry *a, struct hist_entry *b);

	int64_t (*sort)(struct perf_hpp_fmt *fmt,

			struct hist_entry *a, struct hist_entry *b);

	bool (*equal)(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b);



	struct list_head list;

	struct list_head sort_list;
@@ -268,7 +269,6 @@ 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);

bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b);

bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *format);

bool perf_hpp__defined_dynamic_entry(struct perf_hpp_fmt *fmt, struct hists *hists);

tools/perf/util/sort.c

+20 −19
Original line number Diff line number Diff line
@@ -1441,20 +1441,6 @@ struct hpp_sort_entry { 
	struct sort_entry *se;

};



bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)

{

	struct hpp_sort_entry *hse_a;

	struct hpp_sort_entry *hse_b;



	if (!perf_hpp__is_sort_entry(a) || !perf_hpp__is_sort_entry(b))

		return false;



	hse_a = container_of(a, struct hpp_sort_entry, hpp);

	hse_b = container_of(b, struct hpp_sort_entry, hpp);



	return hse_a->se == hse_b->se;

}



void perf_hpp__reset_sort_width(struct perf_hpp_fmt *fmt, struct hists *hists)

{

	struct hpp_sort_entry *hse;
@@ -1540,6 +1526,25 @@ static int64_t __sort__hpp_sort(struct perf_hpp_fmt *fmt, 
	return sort_fn(a, b);

}



bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format)

{

	return format->header == __sort__hpp_header;

}



static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)

{

	struct hpp_sort_entry *hse_a;

	struct hpp_sort_entry *hse_b;



	if (!perf_hpp__is_sort_entry(a) || !perf_hpp__is_sort_entry(b))

		return false;



	hse_a = container_of(a, struct hpp_sort_entry, hpp);

	hse_b = container_of(b, struct hpp_sort_entry, hpp);



	return hse_a->se == hse_b->se;

}



static struct hpp_sort_entry *

__sort_dimension__alloc_hpp(struct sort_dimension *sd)

{
@@ -1561,6 +1566,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd) 
	hse->hpp.cmp = __sort__hpp_cmp;

	hse->hpp.collapse = __sort__hpp_collapse;

	hse->hpp.sort = __sort__hpp_sort;

	hse->hpp.equal = __sort__hpp_equal;



	INIT_LIST_HEAD(&hse->hpp.list);

	INIT_LIST_HEAD(&hse->hpp.sort_list);
@@ -1571,11 +1577,6 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd) 
	return hse;

}



bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format)

{

	return format->header == __sort__hpp_header;

}



static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd)

{

	struct hpp_sort_entry *hse = __sort_dimension__alloc_hpp(sd);