Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1430190

[PATCH 05/27] perf hists browser: Move horizontal scroll init to new()

Show all headers | View raw

From: Jiri Olsa <jolsa@kernel.org>

Moving horizontal scroll init to initialization function as already
intended.

Signed-off-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

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);
 
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/27] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:30 +0200
  [PATCH 26/27] perf config: Introduce new init() and exit() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:30 +0200
  [PATCH 23/27] perf script: Print sample flags more nicely Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:30 +0200
  [PATCH 05/27] perf hists browser: Move horizontal scroll init to new() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 07/27] perf hists browser: Introduce init() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 06/27] perf hists browser: Introduce perf_evsel_browser constructor Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 02/27] perf hists browser: Move hist_browser into header file Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 04/27] perf hists browser: Introduce struct hist_browser title callback Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 11/27] perf tests time-to-tsc: No need to disable an event before deleting it Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 03/27] perf hists browser: Make (new|delete|run) public Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  [PATCH 24/27] perf auxtrace: Add option to feed branches to the thread stack Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 23:40 +0200
  Re: [GIT PULL 00/27] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-06-26 12:50 +0200

csiph-web