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

Commit 29d720ed authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Resort hist entries using group members for output 



When event group is enabled, sorting hist entries on periods for output
should consider groups members' period also.  To do that, build period
table using link/pair information and compare the table.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1358845787-1350-6-git-send-email-namhyung@kernel.org


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

tools/perf/util/evsel.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ struct perf_evsel { 
	char			*group_name;

};



#define hists_to_evsel(h) container_of(h, struct perf_evsel, hists)



struct cpu_map;

struct thread_map;

struct perf_evlist;

tools/perf/util/hist.c

+58 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "hist.h"

#include "session.h"

#include "sort.h"

#include "evsel.h"

#include <math.h>



static bool hists__filter_entry_by_dso(struct hists *hists,
@@ -540,6 +541,62 @@ void hists__collapse_resort_threaded(struct hists *hists) 
 * reverse the map, sort on period.

 */



static int period_cmp(u64 period_a, u64 period_b)

{

	if (period_a > period_b)

		return 1;

	if (period_a < period_b)

		return -1;

	return 0;

}



static int hist_entry__sort_on_period(struct hist_entry *a,

				      struct hist_entry *b)

{

	int ret;

	int i, nr_members;

	struct perf_evsel *evsel;

	struct hist_entry *pair;

	u64 *periods_a, *periods_b;



	ret = period_cmp(a->stat.period, b->stat.period);

	if (ret || !symbol_conf.event_group)

		return ret;



	evsel = hists_to_evsel(a->hists);

	nr_members = evsel->nr_members;

	if (nr_members <= 1)

		return ret;



	periods_a = zalloc(sizeof(periods_a) * nr_members);

	periods_b = zalloc(sizeof(periods_b) * nr_members);



	if (!periods_a || !periods_b)

		goto out;



	list_for_each_entry(pair, &a->pairs.head, pairs.node) {

		evsel = hists_to_evsel(pair->hists);

		periods_a[perf_evsel__group_idx(evsel)] = pair->stat.period;

	}



	list_for_each_entry(pair, &b->pairs.head, pairs.node) {

		evsel = hists_to_evsel(pair->hists);

		periods_b[perf_evsel__group_idx(evsel)] = pair->stat.period;

	}



	for (i = 1; i < nr_members; i++) {

		ret = period_cmp(periods_a[i], periods_b[i]);

		if (ret)

			break;

	}



out:

	free(periods_a);

	free(periods_b);



	return ret;

}



static void __hists__insert_output_entry(struct rb_root *entries,

					 struct hist_entry *he,

					 u64 min_callchain_hits)
@@ -556,7 +613,7 @@ static void __hists__insert_output_entry(struct rb_root *entries, 
		parent = *p;

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



		if (he->stat.period > iter->stat.period)

		if (hist_entry__sort_on_period(he, iter) > 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;