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

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

perf hists browser: Move horizontal scroll init to new() 



Moving horizontal scroll init to initialization function as already
intended.

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/1466459899-1166-6-git-send-email-jolsa@kernel.org


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

tools/perf/ui/browsers/hists.c

+7 −13
Original line number Diff line number Diff line
@@ -2049,6 +2049,8 @@ struct hist_browser *hist_browser__new(struct hists *hists, 
	struct hist_browser *browser = zalloc(sizeof(*browser));



	if (browser) {

		struct perf_hpp_fmt *fmt;



		browser->hists = hists;

		browser->b.refresh = hist_browser__refresh;

		browser->b.refresh_dimensions = hist_browser__refresh_dimensions;
@@ -2058,6 +2060,11 @@ struct hist_browser *hist_browser__new(struct hists *hists, 
		browser->hbt = hbt;

		browser->env = env;

		browser->title = perf_evsel_browser_title;



		hists__for_each_format(hists, fmt) {

			perf_hpp__reset_width(fmt, hists);

			++browser->b.columns;

		}

	}



	return browser;
@@ -2654,7 +2661,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
	int key = -1;

	char buf[64];

	int delay_secs = hbt ? hbt->refresh : 0;

	struct perf_hpp_fmt *fmt;



#define HIST_BROWSER_HELP_COMMON					\

	"h/?/F1        Show this window\n"				\
@@ -2713,18 +2719,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
	memset(options, 0, sizeof(options));

	memset(actions, 0, sizeof(actions));



	hists__for_each_format(browser->hists, fmt) {

		perf_hpp__reset_width(fmt, hists);

		/*

		 * This is done just once, and activates the horizontal scrolling

		 * code in the ui_browser code, it would be better to have a the

		 * counter in the perf_hpp code, but I couldn't find doing it here

		 * works, FIXME by setting this in hist_browser__new, for now, be

		 * clever 8-)

		 */

		++browser->b.columns;

	}



	if (symbol_conf.col_width_list_str)

		perf_hpp__set_user_width(symbol_conf.col_width_list_str);