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

Commit 2e0453af authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Move sort__has_sym into struct perf_hpp_list 



Now we have sort dimensions private for struct hists, we need to make
dimension booleans hists specific as well.

Moving sort__has_sym into struct perf_hpp_list.

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/1462276488-26683-4-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-top.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -688,7 +688,7 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter, 
	struct hist_entry *he = iter->he;

	struct hist_entry *he = iter->he;

	struct perf_evsel *evsel = iter->evsel;

	struct perf_evsel *evsel = iter->evsel;





	if (sort__has_sym && single)

	if (perf_hpp_list.sym && single)

		perf_top__record_precise_ip(top, he, evsel->idx, al->addr);

		perf_top__record_precise_ip(top, he, evsel->idx, al->addr);





	hist__account_cycles(iter->sample->branch_stack, al, iter->sample,

	hist__account_cycles(iter->sample->branch_stack, al, iter->sample,
@@ -919,7 +919,7 @@ static int perf_top__start_counters(struct perf_top *top) 




static int callchain_param__setup_sample_type(struct callchain_param *callchain)

static int callchain_param__setup_sample_type(struct callchain_param *callchain)

{

{

	if (!sort__has_sym) {

	if (!perf_hpp_list.sym) {

		if (callchain->enabled) {

		if (callchain->enabled) {

			ui__error("Selected -g but \"sym\" not present in --sort/-s.");

			ui__error("Selected -g but \"sym\" not present in --sort/-s.");

			return -EINVAL;

			return -EINVAL;

tools/perf/ui/browsers/hists.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2747,7 +2747,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
			 */

			 */

			goto out_free_stack;

			goto out_free_stack;

		case 'a':

		case 'a':

			if (!sort__has_sym) {

			if (!hists__has(hists, sym)) {

				ui_browser__warning(&browser->b, delay_secs * 2,

				ui_browser__warning(&browser->b, delay_secs * 2,

			"Annotation is only available for symbolic views, "

			"Annotation is only available for symbolic views, "

			"include \"sym*\" in --sort to use it.");

			"include \"sym*\" in --sort to use it.");
@@ -2910,7 +2910,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
			continue;

			continue;

		}

		}





		if (!sort__has_sym || browser->selection == NULL)

		if (!hists__has(hists, sym) || browser->selection == NULL)

			goto skip_annotation;

			goto skip_annotation;





		if (sort__mode == SORT_MODE__BRANCH) {

		if (sort__mode == SORT_MODE__BRANCH) {
@@ -2969,7 +2969,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
			 *

			 *

			 * See hist_browser__show_entry.

			 * See hist_browser__show_entry.

			 */

			 */

			if (sort__has_sym && browser->selection->sym) {

			if (hists__has(hists, sym) && browser->selection->sym) {

				nr_options += add_script_opt(browser,

				nr_options += add_script_opt(browser,

							     &actions[nr_options],

							     &actions[nr_options],

							     &options[nr_options],

							     &options[nr_options],

tools/perf/ui/gtk/hists.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -379,7 +379,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, 
			gtk_tree_store_set(store, &iter, col_idx++, s, -1);

			gtk_tree_store_set(store, &iter, col_idx++, s, -1);

		}

		}





		if (symbol_conf.use_callchain && sort__has_sym) {

		if (symbol_conf.use_callchain && hists__has(hists, sym)) {

			if (callchain_param.mode == CHAIN_GRAPH_REL)

			if (callchain_param.mode == CHAIN_GRAPH_REL)

				total = symbol_conf.cumulate_callchain ?

				total = symbol_conf.cumulate_callchain ?

					h->stat_acc->period : h->stat.period;

					h->stat_acc->period : h->stat.period;

tools/perf/ui/hist.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -635,7 +635,7 @@ unsigned int hists__sort_list_width(struct hists *hists) 
		ret += fmt->width(fmt, &dummy_hpp, hists_to_evsel(hists));

		ret += fmt->width(fmt, &dummy_hpp, hists_to_evsel(hists));

	}

	}





	if (verbose && sort__has_sym) /* Addr + origin */

	if (verbose && hists__has(hists, sym)) /* Addr + origin */

		ret += 3 + BITS_PER_LONG / 4;

		ret += 3 + BITS_PER_LONG / 4;





	return ret;

	return ret;

tools/perf/util/annotate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1665,5 +1665,5 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) 




bool ui__has_annotation(void)

bool ui__has_annotation(void)

{

{

	return use_browser == 1 && sort__has_sym;

	return use_browser == 1 && perf_hpp_list.sym;

}
 
}