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

perf hists: Factor output_resort from hists__output_resort 



Currently hists__output_resort() depends on hists based on hists_evsel
struct, but we need to be able to sort common hists as well.

Cutting out the sorting base sorting code into output_resort
function, so it can be reused in following patch.

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


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

tools/perf/util/hist.c

+15 −8
Original line number Original line Diff line number Diff line
@@ -1197,19 +1197,13 @@ static void __hists__insert_output_entry(struct rb_root *entries, 
	rb_insert_color(&he->rb_node, entries);

	rb_insert_color(&he->rb_node, entries);

}

}





void hists__output_resort(struct hists *hists, struct ui_progress *prog)

static void output_resort(struct hists *hists, struct ui_progress *prog,

			  bool use_callchain)

{

{

	struct rb_root *root;

	struct rb_root *root;

	struct rb_node *next;

	struct rb_node *next;

	struct hist_entry *n;

	struct hist_entry *n;

	u64 min_callchain_hits;

	u64 min_callchain_hits;

	struct perf_evsel *evsel = hists_to_evsel(hists);

	bool use_callchain;



	if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph)

		use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN;

	else

		use_callchain = symbol_conf.use_callchain;





	min_callchain_hits = hists__total_period(hists) * (callchain_param.min_percent / 100);

	min_callchain_hits = hists__total_period(hists) * (callchain_param.min_percent / 100);
@@ -1239,6 +1233,19 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog) 
	}

	}

}

}





void hists__output_resort(struct hists *hists, struct ui_progress *prog)

{

	struct perf_evsel *evsel = hists_to_evsel(hists);

	bool use_callchain;



	if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph)

		use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN;

	else

		use_callchain = symbol_conf.use_callchain;



	output_resort(hists, prog, use_callchain);

}



static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,

static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,

				       enum hist_filter filter)

				       enum hist_filter filter)

{

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE