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

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

perf hists: Introduce output_resort_cb method 



When dealing with nested hist entries it's helpful to have a way to
resort those nested objects.

Adding optional callback call into output_resort function and following
new interface function:

  typedef int (*hists__resort_cb_t)(struct hist_entry *he);

  void hists__output_resort_cb(struct hists *hists,
                               struct ui_progress *prog,
                               hists__resort_cb_t cb);

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


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

tools/perf/util/hist.c

+12 −3
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ static void __hists__insert_output_entry(struct rb_root *entries, 
}



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

			  bool use_callchain)

			  bool use_callchain, hists__resort_cb_t cb)

{

	struct rb_root *root;

	struct rb_node *next;
@@ -1711,6 +1711,9 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, 
		n = rb_entry(next, struct hist_entry, rb_node_in);

		next = rb_next(&n->rb_node_in);



		if (cb && cb(n))

			continue;



		__hists__insert_output_entry(&hists->entries, n, min_callchain_hits, use_callchain);

		hists__inc_stats(hists, n);
@@ -1731,12 +1734,18 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro 
	else

		use_callchain = symbol_conf.use_callchain;



	output_resort(evsel__hists(evsel), prog, use_callchain);

	output_resort(evsel__hists(evsel), prog, use_callchain, NULL);

}



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

{

	output_resort(hists, prog, symbol_conf.use_callchain);

	output_resort(hists, prog, symbol_conf.use_callchain, NULL);

}



void hists__output_resort_cb(struct hists *hists, struct ui_progress *prog,

			     hists__resort_cb_t cb)

{

	output_resort(hists, prog, symbol_conf.use_callchain, cb);

}



static bool can_goto_child(struct hist_entry *he, enum hierarchy_move_dir hmd)

tools/perf/util/hist.h

+4 −0
Original line number Diff line number Diff line
@@ -153,8 +153,12 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, 
				   struct perf_hpp_fmt *fmt, int printed);

void hist_entry__delete(struct hist_entry *he);



typedef int (*hists__resort_cb_t)(struct hist_entry *he);



void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *prog);

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

void hists__output_resort_cb(struct hists *hists, struct ui_progress *prog,

			     hists__resort_cb_t cb);

int hists__collapse_resort(struct hists *hists, struct ui_progress *prog);



void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel);