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

Commit 38259a17 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf diff: Get rid of hists__compute_resort() 



The hists__compute_resort() is to sort output fields based on the
given field/criteria.  This was done without the sort list but as we
added the field to the sort list, we can do it with normal
hists__output_resort() using the ->sort callback.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1419656793-32756-2-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-diff.c

+3 −56
Original line number Original line Diff line number Diff line
@@ -581,68 +581,15 @@ hist_entry__cmp_wdiff(struct hist_entry *left, struct hist_entry *right) 
	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF);

	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF);

}

}





static void insert_hist_entry_by_compute(struct rb_root *root,

					 struct hist_entry *he,

					 int c)

{

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);

		if (hist_entry__cmp_compute(he, iter, c) < 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, root);

}



static void hists__compute_resort(struct hists *hists)

{

	struct rb_root *root;

	struct rb_node *next;



	if (sort__need_collapse)

		root = &hists->entries_collapsed;

	else

		root = hists->entries_in;



	hists->entries = RB_ROOT;

	next = rb_first(root);



	hists__reset_stats(hists);

	hists__reset_col_len(hists);



	while (next != NULL) {

		struct hist_entry *he;



		he = rb_entry(next, struct hist_entry, rb_node_in);

		next = rb_next(&he->rb_node_in);



		insert_hist_entry_by_compute(&hists->entries, he, compute);

		hists__inc_stats(hists, he);



		if (!he->filtered)

			hists__calc_col_len(hists, he);

	}

}



static void hists__process(struct hists *hists)

static void hists__process(struct hists *hists)

{

{

	if (show_baseline_only)

	if (show_baseline_only)

		hists__baseline_only(hists);

		hists__baseline_only(hists);





	if (sort_compute) {

	if (sort_compute)

		hists__precompute(hists);

		hists__precompute(hists);

		hists__compute_resort(hists);



	} else {

	hists__output_resort(hists, NULL);

	hists__output_resort(hists, NULL);

	}





	hists__fprintf(hists, true, 0, 0, 0, stdout);

	hists__fprintf(hists, true, 0, 0, 0, stdout);

}

}