Commit 933cbb1c authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf top: Fix -E option behavior 



The -E/--entries option controls how many lines to be printed on stdio
output but it doesn't work as it should be:

If -E option is specified, print that many lines regardless of current
window size, if not automatically adjust number of lines printed to fit
into the window size.

Reported-by: default avatarMinchan Kim <minchan@kernel.org>
Tested-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1368497347-9628-2-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-top.c

+5 −12
Original line number Diff line number Diff line
@@ -70,10 +70,11 @@ 


static volatile int done;



#define HEADER_LINE_NR  5



static void perf_top__update_print_entries(struct perf_top *top)

{

	if (top->print_entries > 9)

		top->print_entries -= 9;

	top->print_entries = top->winsize.ws_row - HEADER_LINE_NR;

}



static void perf_top__sig_winch(int sig __maybe_unused,
@@ -82,13 +83,6 @@ static void perf_top__sig_winch(int sig __maybe_unused, 
	struct perf_top *top = arg;



	get_term_dimensions(&top->winsize);

	if (!top->print_entries

	    || (top->print_entries+4) > top->winsize.ws_row) {

		top->print_entries = top->winsize.ws_row;

	} else {

		top->print_entries += 4;

		top->winsize.ws_row = top->print_entries;

	}

	perf_top__update_print_entries(top);

}
@@ -296,10 +290,10 @@ static void perf_top__print_sym_table(struct perf_top *top) 
				      top->hide_user_symbols,

				      top->hide_kernel_symbols);

	hists__output_recalc_col_len(&top->sym_evsel->hists,

				     top->winsize.ws_row - 3);

				     top->print_entries - printed);

	putchar('\n');

	hists__fprintf(&top->sym_evsel->hists, false,

		       top->winsize.ws_row - 4 - printed, win_width, stdout);

		       top->print_entries - printed, win_width, stdout);

}



static void prompt_integer(int *target, const char *msg)
@@ -477,7 +471,6 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) 
				perf_top__sig_winch(SIGWINCH, NULL, top);

				sigaction(SIGWINCH, &act, NULL);

			} else {

				perf_top__sig_winch(SIGWINCH, NULL, top);

				signal(SIGWINCH, SIG_DFL);

			}

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE