perf top: Fix -E option behavior
Namhyung Kim
maintainerPATCH 1/2 perf top: Fix -E option behavior
From: Namhyung Kim <[email protected]>
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 Minchan Kim <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
--- tools/perf/builtin-top.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
tools/perf/builtin-top.c +5 -12
@@ -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 ;
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 2/2 perf top: Fix percent output when no samples collected
From: Namhyung Kim <[email protected]>
If there's no sample, kernel and exact percent output at the header looked like "-nan%".
Signed-off-by Namhyung Kim <[email protected]>
--- tools/perf/util/top.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
tools/perf/util/top.c +17 -6
@@ -23,20 +23,31 @@size_t perf_top__header_snprintf (struct perf_top *top,char *bf,size_t size) { -float samples_per_sec = top->samples / top->delay_secs; -float ksamples_per_sec = top->kernel_samples / top->delay_secs; -float esamples_percent = (100.0 * top->exact_samples) / top->samples; +float samples_per_sec; +float ksamples_per_sec; +float esamples_percent;struct perf_record_opts *opts = &top->record_opts;struct perf_target *target = &opts->target;size_t ret =0 ; +if (top->samples) { + samples_per_sec = top->samples / top->delay_secs; + ksamples_per_sec = top->kernel_samples / top->delay_secs; + esamples_percent = (100.0 * top->exact_samples) / top->samples; + }else { + samples_per_sec = ksamples_per_sec = esamples_percent =0.0 ; + } +if (!perf_guest) { +float ksamples_percent =0.0 ; + +if (samples_per_sec) + ksamples_percent = (100.0 * ksamples_per_sec) / + samples_per_sec; ret =SNPRINTF (bf, size," PerfTop:%8.0f irqs/sec kernel:%4.1f%%" " exact: %4.1f%% [" , samples_per_sec, -100.0 - (100.0 * ((samples_per_sec - ksamples_per_sec) / - samples_per_sec)), - esamples_percent); + ksamples_percent, esamples_percent); }else {float us_samples_per_sec = top->us_samples / top->delay_secs;float guest_kernel_samples_per_sec = top->guest_kernel_samples / top->delay_secs;
Signature · 1 line
1.7.11.7