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

perf top: Decay all events in the evlist 



Currently perf top only decays entries in a selected evsel.  I don't
know whether it's intended (maybe due to performance reason?) but anyway
it might show incorrect output when event group is used since users will
see leader event is decayed but others are not.

This patch moves the decay code into perf_top__resort_hists() so that
stdio and TUI code shared the logic.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190827231555.121411-1-namhyung@kernel.org


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

tools/perf/builtin-top.c

+13 −25
Original line number Diff line number Diff line
@@ -265,13 +265,23 @@ out_unlock: 
	pthread_mutex_unlock(&notes->lock);

}



static void evlist__resort_hists(struct evlist *evlist)

static void perf_top__resort_hists(struct perf_top *t)

{

	struct evlist *evlist = t->evlist;

	struct evsel *pos;



	evlist__for_each_entry(evlist, pos) {

		struct hists *hists = evsel__hists(pos);



		if (evlist->enabled) {

			if (t->zero) {

				hists__delete_entries(hists);

			} else {

				hists__decay_entries(hists, t->hide_user_symbols,

						     t->hide_kernel_symbols);

			}

		}



		hists__collapse_resort(hists, NULL);



		/* Non-group events are considered as leader */
@@ -320,16 +330,7 @@ static void perf_top__print_sym_table(struct perf_top *top) 
		return;

	}



	if (top->evlist->enabled) {

		if (top->zero) {

			hists__delete_entries(hists);

		} else {

			hists__decay_entries(hists, top->hide_user_symbols,

					     top->hide_kernel_symbols);

		}

	}



	evlist__resort_hists(top->evlist);

	perf_top__resort_hists(top);



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

	putchar('\n');
@@ -577,24 +578,11 @@ 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 evsel *evsel = t->sym_evsel;

	struct hists *hists;



	if (t->evlist->selected != NULL)

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



	hists = evsel__hists(evsel);



	if (t->evlist->enabled) {

		if (t->zero) {

			hists__delete_entries(hists);

		} else {

			hists__decay_entries(hists, t->hide_user_symbols,

					     t->hide_kernel_symbols);

		}

	}



	evlist__resort_hists(t->evlist);

	perf_top__resort_hists(t);



	if (t->lost || t->drop)

		pr_warning("Too slow to read ring buffer (change period (-c/-F) or limit CPUs (-C)\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE