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

Commit 093f0ef3 authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa
Browse files

perf tools: Use hpp formats to sort hist entries 



It wrapped sort entries to hpp functions, so using the hpp sort list
to sort entries.

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


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

tools/perf/util/hist.c

+6 −10
Original line number Diff line number Diff line
@@ -432,11 +432,11 @@ struct hist_entry *__hists__add_entry(struct hists *hists, 
int64_t

hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	struct perf_hpp_fmt *fmt;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		cmp = se->se_cmp(left, right);

	perf_hpp__for_each_sort_list(fmt) {

		cmp = fmt->cmp(left, right);

		if (cmp)

			break;

	}
@@ -447,15 +447,11 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) 
int64_t

hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	struct perf_hpp_fmt *fmt;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		int64_t (*f)(struct hist_entry *, struct hist_entry *);



		f = se->se_collapse ?: se->se_cmp;



		cmp = f(left, right);

	perf_hpp__for_each_sort_list(fmt) {

		cmp = fmt->collapse(left, right);

		if (cmp)

			break;

	}