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

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

perf tools: Fix column alignment when headers aren't shown on TUI 



If user sets ui.show-headers config option to false, it didn't calculate
default column width so it broke the alignment.  This is because it does
the calculation just before showing headers.

Move it to the beginning of the hist browser so that it can be called
regardless of the config option.

Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1406785662-5534-8-git-send-email-namhyung@kernel.org


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

tools/perf/ui/browsers/hists.c

+4 −3
Original line number Diff line number Diff line
@@ -850,9 +850,6 @@ static int hists__scnprintf_headers(char *buf, size_t size, struct hists *hists) 
		if (perf_hpp__should_skip(fmt))

			continue;



		/* We need to ensure length of the columns header. */

		perf_hpp__reset_width(fmt, hists);



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

		if (advance_hpp_check(&dummy_hpp, ret))

			break;
@@ -1501,6 +1498,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
	char buf[64];

	char script_opt[64];

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

	struct perf_hpp_fmt *fmt;



#define HIST_BROWSER_HELP_COMMON					\

	"h/?/F1        Show this window\n"				\
@@ -1550,6 +1548,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 


	memset(options, 0, sizeof(options));



	perf_hpp__for_each_format(fmt)

		perf_hpp__reset_width(fmt, hists);



	if (symbol_conf.col_width_list_str)

		perf_hpp__set_user_width(symbol_conf.col_width_list_str);