perf ui/hist: Fix output for 100.00%
Namhyung Kim
maintainerPATCH 1/2 perf ui/hist: Fix output for 100.00%
From: Namhyung Kim <[email protected]>
Current hpp format functions assume that the output will fit to 6 character including % sign (XX.YY%) so used "%5.2f%%" as a format string. However it might be the case if collapsing resulted in a single entry which has 100.00% (7 character) of period. In this case the output will be shifted by 1 character.
--- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/ui/gtk/browser.c | 2 +- tools/perf/ui/hist.c | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -571,7 +571,7 @@ static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp, \ { \double percent =100.0 * he->_field / hpp->total_period; \ *(double *)hpp->ptr = percent; \ -return scnprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); \ +return scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); \ }HPP__COLOR_FN (overhead, period)
tools/perf/ui/gtk/browser.c +1 -1
@@ -56,7 +56,7 @@ static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ markup =perf_gtk__get_percent_color (percent); \if (markup) \ ret +=scnprintf (hpp->buf, hpp->size,"%s" , markup); \ - ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"%5.2f%%" , percent); \ + ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"%6.2f%%" , percent); \if (markup) \ ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"</span>" ); \ \
tools/perf/ui/hist.c +14 -14
@@ -33,13 +33,13 @@ static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he) percent =0.0 ; } -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); }static int hpp__entry_overhead (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ;if (hpp->ptr) {struct hists *old_hists = hpp->ptr;
@@ -57,52 +57,52 @@ static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)static int hpp__header_overhead_sys (struct perf_hpp *hpp) { -const char *fmt = symbol_conf.field_sep ?"%s" :"%6s" ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;return scnprintf (hpp->buf, hpp->size, fmt,"sys" ); }static int hpp__width_overhead_sys (struct perf_hpp *hpp__maybe_unused ) { -return 6 ; +return 7 ; }static int hpp__color_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_sys / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); }static int hpp__entry_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_sys / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }static int hpp__header_overhead_us (struct perf_hpp *hpp) { -const char *fmt = symbol_conf.field_sep ?"%s" :"%6s" ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;return scnprintf (hpp->buf, hpp->size, fmt,"user" ); }static int hpp__width_overhead_us (struct perf_hpp *hpp__maybe_unused ) { -return 6 ; +return 7 ; }static int hpp__color_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_us / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); }static int hpp__entry_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_us / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }
@@ -121,14 +121,14 @@ static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp, struct hist_entry *he) {double percent =100.0 * he->period_guest_sys / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%% " , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); }static int hpp__entry_overhead_guest_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_guest_sys / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%% " ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }
@@ -147,14 +147,14 @@ static int hpp__color_overhead_guest_us(struct perf_hpp *hpp, struct hist_entry *he) {double percent =100.0 * he->period_guest_us / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%% " , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); }static int hpp__entry_overhead_guest_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_guest_us / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%% " ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }
Signature · 1 line
1.7.11.4
Namhyung Kim
maintainerPATCH 2/2 perf ui/browser: Fix first column printing
From: Namhyung Kim <[email protected]>
As a side effect of commit f5951d56a2ab ("perf hists browser: Use perf_hpp__format functions") perf report TUI got a problem of not refreshing the first character.
Since the previous patch restores the column width of "overhead" to 7 we can start at column 0 now.
--- tools/perf/ui/browsers/hists.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/hists.c +2 -2
@@ -605,7 +605,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,char s[256 ];double percent;int i, printed =0 ; -int width = browser->b.width -1 ; +int width = browser->b.width;char folded_sign =' ' ;bool current_entry =ui_browser__is_current_entry (&browser->b, row);off_t row_offset = entry->row_offset;
@@ -627,7 +627,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, .total_period = browser->hists->stats.total_period, }; -ui_browser__gotorc (&browser->b, row,1 ); +ui_browser__gotorc (&browser->b, row,0 );for (i =0 ; i <PERF_HPP__MAX_INDEX ; i++) {if (!perf_hpp__format[i].cond)
Signature · 1 line
1.7.11.4
[tip:perf/core] perf hists browser: Fix first column printing
Commit-ID: 67d2591656df7a76d4cabca04f1cbe1c7d1c9b3a Gitweb: http://git.kernel.org/tip/67d2591656df7a76d4cabca04f1cbe1c7d1c9b3a Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 12 Sep 2012 15:35:06 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Sep 2012 15:50:14 -0300
perf hists browser: Fix first column printing
As a side effect of commit f5951d56a2ab ("perf hists browser: Use perf_hpp__format functions") perf report TUI got a problem of not refreshing the first character.
Since the previous patch restores the column width of "overhead" to 7 we can start at column 0 now.
--- tools/perf/ui/browsers/hists.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/hists.c +2 -2
@@ -605,7 +605,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,char s[256 ];double percent;int i, printed =0 ; -int width = browser->b.width -1 ; +int width = browser->b.width;char folded_sign =' ' ;bool current_entry =ui_browser__is_current_entry (&browser->b, row);off_t row_offset = entry->row_offset;
@@ -627,7 +627,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, .total_period = browser->hists->stats.total_period, }; -ui_browser__gotorc (&browser->b, row,1 ); +ui_browser__gotorc (&browser->b, row,0 );for (i =0 ; i <PERF_HPP__MAX_INDEX ; i++) {if (!perf_hpp__format[i].cond)
[tip:perf/core] perf hists browser: Fix output for 100.00%
In reply to Namhyung KimCommit-ID: 721b3112f5882a6de7b86b9bef5813c80d1223de Gitweb: http://git.kernel.org/tip/721b3112f5882a6de7b86b9bef5813c80d1223de Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 12 Sep 2012 15:35:05 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Sep 2012 15:49:45 -0300
perf hists browser: Fix output for 100.00%
Current hpp format functions assume that the output will fit to 6 character including % sign (XX.YY%) so used "%5.2f%%" as a format string. However it might be the case if collapsing resulted in a single entry which has 100.00% (7 character) of period. In this case the output will be shifted by 1 character.
--- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/ui/gtk/browser.c | 2 +- tools/perf/ui/hist.c | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -571,7 +571,7 @@ static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp, \ { \double percent =100.0 * he->_field / hpp->total_period; \ *(double *)hpp->ptr = percent; \ -return scnprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); \ +return scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); \ }HPP__COLOR_FN (overhead, period)
tools/perf/ui/gtk/browser.c +1 -1
@@ -56,7 +56,7 @@ static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ markup =perf_gtk__get_percent_color (percent); \if (markup) \ ret +=scnprintf (hpp->buf, hpp->size,"%s" , markup); \ - ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"%5.2f%%" , percent); \ + ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"%6.2f%%" , percent); \if (markup) \ ret +=scnprintf (hpp->buf + ret, hpp->size - ret,"</span>" ); \ \
tools/perf/ui/hist.c +14 -14
@@ -33,13 +33,13 @@ static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he) percent =0.0 ; } -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); }static int hpp__entry_overhead (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ;if (hpp->ptr) {struct hists *old_hists = hpp->ptr;
@@ -57,52 +57,52 @@ static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)static int hpp__header_overhead_sys (struct perf_hpp *hpp) { -const char *fmt = symbol_conf.field_sep ?"%s" :"%6s" ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;return scnprintf (hpp->buf, hpp->size, fmt,"sys" ); }static int hpp__width_overhead_sys (struct perf_hpp *hpp__maybe_unused ) { -return 6 ; +return 7 ; }static int hpp__color_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_sys / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); }static int hpp__entry_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_sys / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }static int hpp__header_overhead_us (struct perf_hpp *hpp) { -const char *fmt = symbol_conf.field_sep ?"%s" :"%6s" ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;return scnprintf (hpp->buf, hpp->size, fmt,"user" ); }static int hpp__width_overhead_us (struct perf_hpp *hpp__maybe_unused ) { -return 6 ; +return 7 ; }static int hpp__color_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_us / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%5.2f%%" , percent); +return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); }static int hpp__entry_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_us / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%5.2f%%" ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }
@@ -121,14 +121,14 @@ static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp, struct hist_entry *he) {double percent =100.0 * he->period_guest_sys / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%% " , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); }static int hpp__entry_overhead_guest_sys (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_guest_sys / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%% " ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }
@@ -147,14 +147,14 @@ static int hpp__color_overhead_guest_us(struct perf_hpp *hpp, struct hist_entry *he) {double percent =100.0 * he->period_guest_us / hpp->total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %5.2f%% " , percent); +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); }static int hpp__entry_overhead_guest_us (struct perf_hpp *hpp,struct hist_entry *he) {double percent =100.0 * he->period_guest_us / hpp->total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %5.2f%% " ; +const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ;return scnprintf (hpp->buf, hpp->size, fmt, percent); }