From: Jiri Olsa Date: Mon, 20 Jun 2016 21:58:16 +0000 (+0200) Subject: perf hists browser: Move horizontal scroll init to new() X-Git-Tag: v4.8-rc1~169^2~19^2~22 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=b1c7a8f7a1dad1aa46ec26cdfa487598634c5267;p=cascardo%2Flinux.git perf hists browser: Move horizontal scroll init to new() Moving horizontal scroll init to initialization function as already intended. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1466459899-1166-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index a74cbd381607..ccb9ed62a037 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -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);