Commit 452ce03b authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Introduce perf_evsel__output_resort function 



Adding evsel specific function to sort hists_evsel based hists. The
hists__output_resort can be now used to sort common hists object.

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


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

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int __cmd_annotate(struct perf_annotate *ann) 
			hists__collapse_resort(hists, NULL);

			/* Don't sort callchain */

			perf_evsel__reset_sample_bit(pos, CALLCHAIN);

			hists__output_resort(hists, NULL);

			perf_evsel__output_resort(pos, NULL);



			if (symbol_conf.event_group &&

			    !perf_evsel__is_group_leader(pos))

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void report__output_resort(struct report *rep) 
	ui_progress__init(&prog, rep->nr_entries, "Sorting events for output...");



	evlist__for_each(rep->session->evlist, pos)

		hists__output_resort(evsel__hists(pos), &prog);

		perf_evsel__output_resort(pos, &prog);



	ui_progress__finish();

}

tools/perf/builtin-top.c

+6 −4
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ static void perf_top__print_sym_table(struct perf_top *top) 
	char bf[160];

	int printed = 0;

	const int win_width = top->winsize.ws_col - 1;

	struct hists *hists = evsel__hists(top->sym_evsel);

	struct perf_evsel *evsel = top->sym_evsel;

	struct hists *hists = evsel__hists(evsel);



	puts(CONSOLE_CLEAR);
@@ -288,7 +289,7 @@ static void perf_top__print_sym_table(struct perf_top *top) 
	}



	hists__collapse_resort(hists, NULL);

	hists__output_resort(hists, NULL);

	perf_evsel__output_resort(evsel, NULL);



	hists__output_recalc_col_len(hists, top->print_entries - printed);

	putchar('\n');
@@ -540,6 +541,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) 
static void perf_top__sort_new_samples(void *arg)

{

	struct perf_top *t = arg;

	struct perf_evsel *evsel = t->sym_evsel;

	struct hists *hists;



	perf_top__reset_sample_counters(t);
@@ -547,7 +549,7 @@ static void perf_top__sort_new_samples(void *arg) 
	if (t->evlist->selected != NULL)

		t->sym_evsel = t->evlist->selected;



	hists = evsel__hists(t->sym_evsel);

	hists = evsel__hists(evsel);



	if (t->evlist->enabled) {

		if (t->zero) {
@@ -559,7 +561,7 @@ static void perf_top__sort_new_samples(void *arg) 
	}



	hists__collapse_resort(hists, NULL);

	hists__output_resort(hists, NULL);

	perf_evsel__output_resort(evsel, NULL);

}



static void *display_thread_tui(void *arg)

tools/perf/tests/hists_cumulate.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int do_test(struct hists *hists, struct result *expected, size_t nr_expec 
	 * function since TEST_ASSERT_VAL() returns in case of failure.

	 */

	hists__collapse_resort(hists, NULL);

	hists__output_resort(hists, NULL);

	perf_evsel__output_resort(hists_to_evsel(hists), NULL);



	if (verbose > 2) {

		pr_info("use callchain: %d, cumulate callchain: %d\n",

tools/perf/tests/hists_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int test__hists_filter(int subtest __maybe_unused) 
		struct hists *hists = evsel__hists(evsel);



		hists__collapse_resort(hists, NULL);

		hists__output_resort(hists, NULL);

		perf_evsel__output_resort(evsel, NULL);



		if (verbose > 2) {

			pr_info("Normal histogram\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE