perf tools: Honor column width setting (v3)
Namhyung Kim
maintainercover perf tools: Honor column width setting (v3)
Hello,
This patchset is to control perf report/top output column width by -w/--column-widths option so that it can fit into the terminal size. The -w option is there for perf report but it ignored by recent output field changed due to some reason. This patchset fixes it and supports perf top also.
This is sometimes useful if your terminal is small and there's some C++ applications which have amazingly long symbol names. Without this patchset user might not see those symbols on TUI, since it maps left/right arrow keys to other functions.
The -w option sets column width starting from the first column (overhead or optional overhead_children column unless -F option is given). It doesn't make sense to limit those overhead columns so it's not a hard-limit for them. But it *is* a hard-limit for other columns such as comm, dso, symbol, and so on. One can use 0 not to limit/force a width for those columns.
For example:
$ perf report --stdio -s comm,dso
...
# Overhead Command Shared Object
# ........ ............... .....................................................
#
71.08% gnome-shell perf-1497.map
9.23% gnome-shell swrast_dri.so
3.99% Xorg [unknown]
3.18% Xorg [kernel.kallsyms]
2.93% gnome-shell [kernel.kallsyms]
2.41% swapper [kernel.kallsyms]
1.55% synergys libpthread-2.15.so
1.08% synergys synergys
0.68% systemd-journal [kernel.kallsyms]
0.59% synergys libstdc++.so.6.0.17
0.58% gnome-shell libc-2.15.so
0.54% kworker/0:2 [kernel.kallsyms]
0.20% systemd-journal [unknown]
0.19% gnome-shell libclutter-1.0.so.0.1000.8.#prelink#.1kh1we (deleted)
0.18% firefox libxul.so (deleted)
0.17% gnome-shell libcogl.so.9.1.1.#prelink#.ZL3fn1 (deleted)
0.14% firefox [kernel.kallsyms]
0.14% gnome-shell libgobject-2.0.so.0.3200.4
0.13% gnome-shell libpthread-2.15.so
0.11% synergys [kernel.kallsyms]
0.10% perf [kernel.kallsyms] $ perf report --stdio -s comm,dso -w 0,10,20 # 0 means no limit
...
# Overhead Command Shared Object
# ........ .......... ....................
#
71.08% gnome-shel perf-1497.map
9.23% gnome-shel swrast_dri.so
3.99% Xorg [unknown]
3.18% Xorg [kernel.kallsyms]
2.93% gnome-shel [kernel.kallsyms]
2.41% swapper [kernel.kallsyms]
1.55% synergys libpthread-2.15.so
1.08% synergys synergys
0.68% systemd-jo [kernel.kallsyms]
0.59% synergys libstdc++.so.6.0.17
0.58% gnome-shel libc-2.15.so
0.54% kworker/0: [kernel.kallsyms]
0.20% systemd-jo [unknown]
0.19% gnome-shel libclutter-1.0.so.0.
0.18% firefox libxul.so (deleted)
0.17% gnome-shel libcogl.so.9.1.1.#pr
0.14% firefox [kernel.kallsyms]
0.14% gnome-shel libgobject-2.0.so.0.
0.13% gnome-shel libpthread-2.15.so
0.11% synergys [kernel.kallsyms]
0.10% perf [kernel.kallsyms] * changes in v3:
- use single function for fmt->header() and ->width() (Jiri)
- limit symbol sort print function to given width (Jiri)
- do not demangle C++ function parameters by default
* changes in v2:
- fix TUI alignment when no header is shown (Jiri)
- change printing order of pid sort key (Jiri)
You can also get this from 'perf/width-v3' branch on my tree
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Thanks,
Namhyung
Namhyung Kim (8):
perf tools: Left-align output contents
perf tools: Make __hpp__fmt() receive an additional len argument perf tools: Save column length in perf_hpp_fmt
perf report: Honor column width setting
perf top: Add -w option for setting column width
perf tools: Add name field into perf_hpp_fmt
perf tools: Fix column alignment when headers aren't shown on TUI perf symbol: Don't demangle parameters and such by default
tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-top.txt | 6 + tools/perf/builtin-top.c | 3 + tools/perf/ui/browsers/hists.c | 31 ++-- tools/perf/ui/gtk/hists.c | 18 +- tools/perf/ui/hist.c | 280 +++++++++++++++++++------------ tools/perf/ui/stdio/hist.c | 4 +- tools/perf/util/color.c | 16 ++ tools/perf/util/color.h | 1 + tools/perf/util/hist.h | 17 +- tools/perf/util/sort.c | 58 ++++--- tools/perf/util/symbol-elf.c | 7 +- tools/perf/util/symbol.h | 1 + 13 files changed, 282 insertions(+), 162 deletions(-)
Signature · 1 line
2.0.0
Namhyung Kim
maintainerPATCH 1/8 perf tools: Left-align output contents
Now perf left-aligns column headers but the contents does not. It should have same alignment. This requires a change in pid sort key - it consists of two part (pid and comm). As length of comm can be vary it'd be better to change the order of them.
Thanks to Jiri Olsa for pointing this out.
--- tools/perf/util/sort.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/sort.c +5 -5
@@ -70,12 +70,12 @@ static int hist_entry__thread_snprintf(struct hist_entry *he, char *bf, size_t size, unsigned int width) {const char *comm =thread__comm_str (he->thread); -return repsep_snprintf (bf, size,"%*s:%5d" , width -6 , - comm ?:"" , he->thread->tid); +return repsep_snprintf (bf, size,"%5d:%-*s" , he->thread->tid, + width -6 , comm ?:"" ); }struct sort_entry sort_thread = { - .se_header ="Command: Pid" , + .se_header =" Pid:Command" , .se_cmp = sort__thread_cmp, .se_snprintf = hist_entry__thread_snprintf, .se_width_idx =HISTC_THREAD ,
@@ -106,7 +106,7 @@ sort__comm_sort(struct hist_entry *left, struct hist_entry *right)static int hist_entry__comm_snprintf (struct hist_entry *he,char *bf,size_t size,unsigned int width) { -return repsep_snprintf (bf, size,"%*s" , width,comm__str (he->comm)); +return repsep_snprintf (bf, size,"%-*s" , width,comm__str (he->comm)); }struct sort_entry sort_comm = {
@@ -305,7 +305,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *he, char *bf, size_t size, unsigned int width __maybe_unused) { -return repsep_snprintf (bf, size,"%s" , he->srcline); +return repsep_snprintf (bf, size,"%-s" , he->srcline); }struct sort_entry sort_srcline = {
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Left-align output contents
perf tools: Left-align output contents
Commit-ID: 8246de88e95ddef7508f5601d7af85c3ab9e476b Gitweb: http://git.kernel.org/tip/8246de88e95ddef7508f5601d7af85c3ab9e476b Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:35 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:04 -0300
perf tools: Left-align output contents
Now perf left-aligns column headers but the contents does not. It should have same alignment. This requires a change in pid sort key - it consists of two part (pid and comm). As length of comm can be vary it'd be better to change the order of them.
Thanks to Jiri Olsa for pointing this out.
--- tools/perf/util/sort.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/sort.c +5 -5
@@ -70,12 +70,12 @@ static int hist_entry__thread_snprintf(struct hist_entry *he, char *bf, size_t size, unsigned int width) {const char *comm =thread__comm_str (he->thread); -return repsep_snprintf (bf, size,"%*s:%5d" , width -6 , - comm ?:"" , he->thread->tid); +return repsep_snprintf (bf, size,"%5d:%-*s" , he->thread->tid, + width -6 , comm ?:"" ); }struct sort_entry sort_thread = { - .se_header ="Command: Pid" , + .se_header =" Pid:Command" , .se_cmp = sort__thread_cmp, .se_snprintf = hist_entry__thread_snprintf, .se_width_idx =HISTC_THREAD ,
@@ -106,7 +106,7 @@ sort__comm_sort(struct hist_entry *left, struct hist_entry *right)static int hist_entry__comm_snprintf (struct hist_entry *he,char *bf,size_t size,unsigned int width) { -return repsep_snprintf (bf, size,"%*s" , width,comm__str (he->comm)); +return repsep_snprintf (bf, size,"%-*s" , width,comm__str (he->comm)); }struct sort_entry sort_comm = {
@@ -305,7 +305,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *he, char *bf, size_t size, unsigned int width __maybe_unused) { -return repsep_snprintf (bf, size,"%s" , he->srcline); +return repsep_snprintf (bf, size,"%-s" , he->srcline); }struct sort_entry sort_srcline = {
Namhyung Kim
maintainerPATCH 2/8 perf tools: Make __hpp__fmt() receive an additional len argument
In reply to Namhyung KimSo that it can properly handle alignment requirements later. To do that, add percent_color_len_snprintf() fucntion to help coloring of overhead columns.
--- tools/perf/ui/browsers/hists.c | 14 ++++++++------ tools/perf/ui/gtk/hists.c | 8 +++++--- tools/perf/ui/hist.c | 43 +++++++++++++++++++++--------------------- tools/perf/util/color.c | 16 ++++++++++++++++ tools/perf/util/color.h | 1 + tools/perf/util/hist.h | 4 ++-- 6 files changed, 54 insertions(+), 32 deletions(-)
tools/perf/ui/browsers/hists.c +8 -6
@@ -653,17 +653,18 @@ struct hpp_arg {static int __hpp__slsmg_color_printf (struct perf_hpp *hpp,const char *fmt, ...) {struct hpp_arg *arg = hpp->ptr; -int ret; +int ret, len;va_list args;double percent;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);ui_browser__set_percent_color (arg->b, percent, arg->current_entry); - ret =scnprintf (hpp->buf, hpp->size, fmt, percent); + ret =scnprintf (hpp->buf, hpp->size, fmt, len, percent);slsmg_printf ("%s" , hpp->buf);advance_hpp (hpp, ret);
@@ -681,7 +682,7 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, __hpp_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, __hpp_get_##_field, " %*.2f%%", 6, \__hpp__slsmg_color_printf ,true ); \ }
@@ -697,13 +698,14 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ struct hist_entry *he) \ { \if (!symbol_conf.cumulate_callchain) { \ -int ret =scnprintf (hpp->buf, hpp->size,"%8s" ,"N/A" ); \ +int ret =scnprintf (hpp->buf, hpp->size, \ +"%*s" ,8 ,"N/A" ); \slsmg_printf ("%s" , hpp->buf); \ \return ret; \ } \ - return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %6.2f%%", \ - __hpp__slsmg_color_printf, true); \ + return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %*.2f%%", \ +6 , __hpp__slsmg_color_printf, true); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/gtk/hists.c +5 -3
@@ -11,6 +11,7 @@static int __percent_color_snprintf (struct perf_hpp *hpp,const char *fmt, ...) {int ret =0 ; +int len;va_list args;double percent;const char *markup;
@@ -18,6 +19,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)size_t size = hpp->size;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);
@@ -25,7 +27,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret, fmt, percent); + ret +=scnprintf (buf + ret, size - ret, fmt, len, percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -43,7 +45,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }
@@ -57,7 +59,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %6.2f%%", \ + return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }
tools/perf/ui/hist.c +22 -21
130 lines not on this page · raw message
tools/perf/util/color.c +16 -0
@@ -335,3 +335,19 @@ int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)va_end (args);return value_color_snprintf (bf, size, fmt, percent); } + +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...) +{ +va_list args; +int len; +double percent; +const char *color; + +va_start (args, fmt); + len =va_arg (args, int); + percent =va_arg (args, double); +va_end (args); + + color =get_percent_color (percent); +return color_snprintf (bf, size, color, fmt, len, percent); +}
tools/perf/util/color.h +1 -0
@@ -41,6 +41,7 @@ int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);int color_fwrite_lines (FILE *fp,const char *color,size_t count,const char *buf);int value_color_snprintf (char *bf,size_t size,const char *fmt,double value);int percent_color_snprintf (char *bf,size_t size,const char *fmt, ...); +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...);int percent_color_fprintf (FILE *fp,const char *fmt,double percent);const char *get_percent_color (double percent);
tools/perf/util/hist.h +2 -2
@@ -267,10 +267,10 @@ typedef int (*hpp_callback_fn)(struct perf_hpp *hpp, bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc)
Signature · 1 line
2.0.0
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 2/8] perf tools: Make __hpp__fmt() receive an additional len argument
Em Thu, Jul 31, 2014 at 02:47:36PM +0900, Namhyung Kim escreveu:
Quoted 3 lines
So that it can properly handle alignment requirements later. To do that, add
percent_color_len_snprintf()fucntion to help coloring of overhead columns.
Can you elaborate on this description? What is not possible to do before this patch?
Perhaps a formatted line before this patch and then the same line formatted after the patch?
Quoted 310 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/ui/browsers/hists.c | 14 ++++++++------ tools/perf/ui/gtk/hists.c | 8 +++++--- tools/perf/ui/hist.c | 43 +++++++++++++++++++++--------------------- tools/perf/util/color.c | 16 ++++++++++++++++ tools/perf/util/color.h | 1 + tools/perf/util/hist.h | 4 ++-- 6 files changed, 54 insertions(+), 32 deletions(-)tools/perf/ui/browsers/hists.c +8
-6@@ -653,17 +653,18 @@ struct hpp_arg {static int __hpp__slsmg_color_printf (struct perf_hpp *hpp,const char *fmt, ...) {struct hpp_arg *arg = hpp->ptr; -int ret; +int ret, len;va_list args;double percent;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);ui_browser__set_percent_color (arg->b, percent, arg->current_entry); - ret =scnprintf (hpp->buf, hpp->size, fmt, percent); + ret =scnprintf (hpp->buf, hpp->size, fmt, len, percent);slsmg_printf ("%s" , hpp->buf);advance_hpp (hpp, ret);@@ -681,7 +682,7 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, __hpp_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, __hpp_get_##_field, " %*.2f%%", 6, \__hpp__slsmg_color_printf ,true ); \ }@@ -697,13 +698,14 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ struct hist_entry *he) \ { \if (!symbol_conf.cumulate_callchain) { \ -int ret =scnprintf (hpp->buf, hpp->size,"%8s" ,"N/A" ); \ +int ret =scnprintf (hpp->buf, hpp->size, \ +"%*s" ,8 ,"N/A" ); \slsmg_printf ("%s" , hpp->buf); \ \return ret; \ } \ - return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %6.2f%%", \ - __hpp__slsmg_color_printf, true); \ + return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %*.2f%%", \ +6 , __hpp__slsmg_color_printf, true); \ }__HPP_COLOR_PERCENT_FN (overhead, period)tools/perf/ui/gtk/hists.c +5
-3@@ -11,6 +11,7 @@static int __percent_color_snprintf (struct perf_hpp *hpp,const char *fmt, ...) {int ret =0 ; +int len;va_list args;double percent;const char *markup;@@ -18,6 +19,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)size_t size = hpp->size;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);@@ -25,7 +27,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret, fmt, percent); + ret +=scnprintf (buf + ret, size - ret, fmt, len, percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );@@ -43,7 +45,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }@@ -57,7 +59,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %6.2f%%", \ + return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }tools/perf/ui/hist.c +22
-21@@ -16,7 +16,7 @@ })int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent) {int ret;@@ -32,9 +32,9 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,if (total) percent =100.0 *get_field (he) / total; - ret =hpp__call_print_fn (hpp, print_fn, fmt, percent); + ret =hpp__call_print_fn (hpp, print_fn, fmt, len, percent); }else - ret =hpp__call_print_fn (hpp, print_fn, fmt,get_field (he)); + ret =hpp__call_print_fn (hpp, print_fn, fmt, len,get_field (he));if (perf_evsel__is_group_event (evsel)) {int prev_idx, idx_delta;@@ -60,19 +60,19 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,*/ if (fmt_percent) { ret +=hpp__call_print_fn (hpp, print_fn, - fmt,0.0 ); + fmt, len,0.0 ); }else { ret +=hpp__call_print_fn (hpp, print_fn, - fmt,0ULL ); + fmt, len,0ULL ); } }if (fmt_percent) { - ret +=hpp__call_print_fn (hpp, print_fn, fmt, + ret +=hpp__call_print_fn (hpp, print_fn, fmt, len,100.0 * period / total); }else { ret +=hpp__call_print_fn (hpp, print_fn, fmt, - period); + len, period); } prev_idx =perf_evsel__group_idx (evsel);@@ -86,10 +86,10 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,*/ if (fmt_percent) { ret +=hpp__call_print_fn (hpp, print_fn, - fmt,0.0 ); + fmt, len,0.0 ); }else { ret +=hpp__call_print_fn (hpp, print_fn, - fmt,0ULL ); + fmt, len,0ULL ); } } }@@ -105,7 +105,7 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, }int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent) {if (!symbol_conf.cumulate_callchain) {@@ -113,7 +113,7 @@ int __hpp__fmt_acc(struct perf_hpp *hpp, struct hist_entry *he, fmt_percent ? 8 : 12, "N/A"); } -return __hpp__fmt (hpp, he, get_field, fmt, print_fn, fmt_percent); +return __hpp__fmt (hpp, he, get_field, fmt, len, print_fn, fmt_percent); }static int field_cmp (u64 field_a,u64 field_b)@@ -221,11 +221,12 @@ static int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)va_list args;ssize_t ssize = hpp->size;double percent; -int ret; +int ret, len;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double); - ret =value_color_snprintf (hpp->buf, hpp->size, fmt, percent); + ret =percent_color_len_snprintf (hpp->buf, hpp->size, fmt, len, percent);va_end (args);return (ret >= ssize) ? (ssize -1 ) : ret;@@ -253,7 +254,7 @@ static u64 he_get_##_field(struct hist_entry *he) \ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \ hpp_color_scnprintf, true); \ }@@ -261,8 +262,8 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ -const char *fmt = symbol_conf.field_sep ?" %.2f" :" %6.2f%%" ; \ - return __hpp__fmt(hpp, he, he_get_##_field, fmt, \ +int len = symbol_conf.field_sep ?1 :6 ; \ + return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", len, \ hpp_entry_scnprintf, true); \ }@@ -281,7 +282,7 @@ static u64 he_get_acc_##_field(struct hist_entry *he) \ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %6.2f%%", \ + return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \ hpp_color_scnprintf, true); \ }@@ -289,8 +290,8 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ -const char *fmt = symbol_conf.field_sep ?" %.2f" :" %6.2f%%" ; \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, fmt, \ +int len = symbol_conf.field_sep ?1 :6 ; \ + return __hpp__fmt_acc(hpp, he, he_get_##_field, " %*.2f%%", len, \ hpp_entry_scnprintf, true); \ }@@ -309,8 +310,8 @@ static u64 he_get_raw_##_field(struct hist_entry *he) \ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ -const char *fmt = symbol_conf.field_sep ?" %" PRIu64 :" %11" PRIu64; \ - return __hpp__fmt(hpp, he, he_get_raw_##_field, fmt, \ +int len = symbol_conf.field_sep ?1 :11 ; \ + return __hpp__fmt(hpp, he, he_get_raw_##_field, " %*"PRIu64, len, \ hpp_entry_scnprintf, false); \ }tools/perf/util/color.c +16
-0@@ -335,3 +335,19 @@ int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)va_end (args);return value_color_snprintf (bf, size, fmt, percent); } + +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...) +{ +va_list args; +int len; +double percent; +const char *color; + +va_start (args, fmt); + len =va_arg (args, int); + percent =va_arg (args, double); +va_end (args); + + color =get_percent_color (percent); +return color_snprintf (bf, size, color, fmt, len, percent); +}tools/perf/util/color.h +1
-0@@ -41,6 +41,7 @@ int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);int color_fwrite_lines (FILE *fp,const char *color,size_t count,const char *buf);int value_color_snprintf (char *bf,size_t size,const char *fmt,double value);int percent_color_snprintf (char *bf,size_t size,const char *fmt, ...); +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...);int percent_color_fprintf (FILE *fp,const char *fmt,double percent);const char *get_percent_color (double percent);tools/perf/util/hist.h +2
-2@@ -267,10 +267,10 @@ typedef int (*hpp_callback_fn)(struct perf_hpp *hpp, bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc)Signature · 1 line
2.0.0
Namhyung Kim
maintainerRe: [PATCH 2/8] perf tools: Make __hpp__fmt() receive an additional len argument
Hi Arnaldo,
Quoted 7 lines · Arnaldo Carvalho de Melo
Em Thu, Jul 31, 2014 at 02:47:36PM +0900, Namhyung Kim escreveu:
Quoted 3 lines
So that it can properly handle alignment requirements later. To do that, add
percent_color_len_snprintf()fucntion to help coloring of overhead columns.Can you elaborate on this description? What is not possible to do before this patch?
This patch is a preparation that moves hard-coded print width out of the format string so that it can be passed from external settings later.
Quoted 3 lines
Perhaps a formatted line before this patch and then the same line formatted after the patch?
The default behavior wasn't changed, it's only meaningful when user gives field width using -w option. You can see the difference in the description 0/8.
Thanks,
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 2/8] perf tools: Make __hpp__fmt() receive an additional len argument
Em Mon, Aug 11, 2014 at 05:05:33PM +0900, Namhyung Kim escreveu:
Quoted 8 lines
Hi Arnaldo,
Quoted 5 lines · Arnaldo Carvalho de Melo
Em Thu, Jul 31, 2014 at 02:47:36PM +0900, Namhyung Kim escreveu:
Quoted 3 lines
So that it can properly handle alignment requirements later. To do that, add
percent_color_len_snprintf()fucntion to help coloring of overhead columns.
Quoted 5 lines
Quoted 2 lines
Can you elaborate on this description? What is not possible to do before this patch?
This patch is a preparation that moves hard-coded print width out of the format string so that it can be passed from external settings later.
Ok, please add this to the patch description?
Quoted 6 lines
Quoted 2 lines
Perhaps a formatted line before this patch and then the same line formatted after the patch?
The default behavior wasn't changed, it's only meaningful when user gives field width using -w option. You can see the difference in the description 0/8.
- Arnaldo
Namhyung Kim
maintainerRe: [PATCH 2/8] perf tools: Make __hpp__fmt() receive an additional len argument
Hi Arnaldo,
Quoted 9 lines · Arnaldo Carvalho de Melo
Em Mon, Aug 11, 2014 at 05:05:33PM +0900, Namhyung Kim escreveu:
Quoted 8 lines
Hi Arnaldo,
Quoted 5 lines · Arnaldo Carvalho de Melo
Em Thu, Jul 31, 2014 at 02:47:36PM +0900, Namhyung Kim escreveu:
Quoted 3 lines
So that it can properly handle alignment requirements later. To do that, add
percent_color_len_snprintf()fucntion to help coloring of overhead columns.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Can you elaborate on this description? What is not possible to do before this patch?
This patch is a preparation that moves hard-coded print width out of the format string so that it can be passed from external settings later.
Ok, please add this to the patch description?
Will do. Btw, do you want me to resend the series? It seems your tree already merged it..
Thanks,
Namhyung
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Make __hpp__fmt() receive an additional len argument
In reply to Namhyung Kimperf tools: Make __hpp__fmt() receive an additional len argument
Commit-ID: d675107ce6fa988102851e0b0ef06e46c8aa7ac6 Gitweb: http://git.kernel.org/tip/d675107ce6fa988102851e0b0ef06e46c8aa7ac6 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:36 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:05 -0300
perf tools: Make __hpp__fmt() receive an additional len argument
So that it can properly handle alignment requirements later. To do that, add percent_color_len_snprintf() fucntion to help coloring of overhead columns.
--- tools/perf/ui/browsers/hists.c | 14 ++++++++------ tools/perf/ui/gtk/hists.c | 8 +++++--- tools/perf/ui/hist.c | 43 +++++++++++++++++++++--------------------- tools/perf/util/color.c | 16 ++++++++++++++++ tools/perf/util/color.h | 1 + tools/perf/util/hist.h | 4 ++-- 6 files changed, 54 insertions(+), 32 deletions(-)
tools/perf/ui/browsers/hists.c +8 -6
@@ -653,17 +653,18 @@ struct hpp_arg {static int __hpp__slsmg_color_printf (struct perf_hpp *hpp,const char *fmt, ...) {struct hpp_arg *arg = hpp->ptr; -int ret; +int ret, len;va_list args;double percent;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);ui_browser__set_percent_color (arg->b, percent, arg->current_entry); - ret =scnprintf (hpp->buf, hpp->size, fmt, percent); + ret =scnprintf (hpp->buf, hpp->size, fmt, len, percent);slsmg_printf ("%s" , hpp->buf);advance_hpp (hpp, ret);
@@ -681,7 +682,7 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, __hpp_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, __hpp_get_##_field, " %*.2f%%", 6, \__hpp__slsmg_color_printf ,true ); \ }
@@ -697,13 +698,14 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ struct hist_entry *he) \ { \if (!symbol_conf.cumulate_callchain) { \ -int ret =scnprintf (hpp->buf, hpp->size,"%8s" ,"N/A" ); \ +int ret =scnprintf (hpp->buf, hpp->size, \ +"%*s" ,8 ,"N/A" ); \slsmg_printf ("%s" , hpp->buf); \ \return ret; \ } \ - return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %6.2f%%", \ - __hpp__slsmg_color_printf, true); \ + return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %*.2f%%", \ +6 , __hpp__slsmg_color_printf, true); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/gtk/hists.c +5 -3
@@ -11,6 +11,7 @@static int __percent_color_snprintf (struct perf_hpp *hpp,const char *fmt, ...) {int ret =0 ; +int len;va_list args;double percent;const char *markup;
@@ -18,6 +19,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)size_t size = hpp->size;va_start (args, fmt); + len =va_arg (args, int); percent =va_arg (args, double);va_end (args);
@@ -25,7 +27,7 @@ static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret, fmt, percent); + ret +=scnprintf (buf + ret, size - ret, fmt, len, percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -43,7 +45,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }
@@ -57,7 +59,7 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %6.2f%%", \ + return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \__percent_color_snprintf ,true ); \ }
tools/perf/ui/hist.c +22 -21
130 lines not on this page · raw message
tools/perf/util/color.c +16 -0
@@ -335,3 +335,19 @@ int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)va_end (args);return value_color_snprintf (bf, size, fmt, percent); } + +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...) +{ +va_list args; +int len; +double percent; +const char *color; + +va_start (args, fmt); + len =va_arg (args, int); + percent =va_arg (args, double); +va_end (args); + + color =get_percent_color (percent); +return color_snprintf (bf, size, color, fmt, len, percent); +}
tools/perf/util/color.h +1 -0
@@ -41,6 +41,7 @@ int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);int color_fwrite_lines (FILE *fp,const char *color,size_t count,const char *buf);int value_color_snprintf (char *bf,size_t size,const char *fmt,double value);int percent_color_snprintf (char *bf,size_t size,const char *fmt, ...); +int percent_color_len_snprintf (char *bf,size_t size,const char *fmt, ...);int percent_color_fprintf (FILE *fp,const char *fmt,double percent);const char *get_percent_color (double percent);
tools/perf/util/hist.h +2 -2
@@ -267,10 +267,10 @@ typedef int (*hpp_callback_fn)(struct perf_hpp *hpp, bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt, +hpp_field_fn get_field,const char *fmt,int len,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc)
Namhyung Kim
maintainerPATCH 3/8 perf tools: Save column length in perf_hpp_fmt
In reply to Namhyung KimSave column length in the hpp format and pass it to print functions. This is a preparation for users to control column width in the output.
--- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/ui/hist.c | 135 +++++++++++++++++++++++++++-------------- tools/perf/util/hist.h | 2 + tools/perf/util/sort.c | 3 +- 4 files changed, 94 insertions(+), 48 deletions(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -849,7 +849,7 @@ static int hists__scnprintf_headers(char *buf, size_t size, struct hists *hists)if (perf_hpp__should_skip (fmt))continue ; -/* We need to add the length of the columns header. */ +/* 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));
tools/perf/ui/hist.c +89 -46
226 lines not on this page · raw message
tools/perf/util/hist.h +2 -0
@@ -207,6 +207,7 @@ struct perf_hpp_fmt {struct list_head list;struct list_head sort_list;bool elide; +int len; };extern struct list_head perf_hpp__list;
@@ -261,6 +262,7 @@ static inline bool perf_hpp__should_skip(struct perf_hpp_fmt *format) }void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists); +void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists);typedef u64 (*hpp_field_fn )(struct hist_entry *he);typedef int (*hpp_callback_fn )(struct perf_hpp *hpp,bool front);
tools/perf/util/sort.c +2 -1
@@ -1194,7 +1194,7 @@ bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)return hse_a->se == hse_b->se; } -void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists) +void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists) {struct hpp_sort_entry *hse;
@@ -1265,6 +1265,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)INIT_LIST_HEAD (&hse->hpp.list);INIT_LIST_HEAD (&hse->hpp.sort_list); hse->hpp.elide = false; + hse->hpp.len =0 ;return hse; }
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Save column length in perf_hpp_fmt
perf tools: Save column length in perf_hpp_fmt
Commit-ID: e0d66c74b09f5103eef441a98b68056c4dae4cac Gitweb: http://git.kernel.org/tip/e0d66c74b09f5103eef441a98b68056c4dae4cac Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:37 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:05 -0300
perf tools: Save column length in perf_hpp_fmt
Save column length in the hpp format and pass it to print functions. This is a preparation for users to control column width in the output.
--- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/ui/hist.c | 135 +++++++++++++++++++++++++++-------------- tools/perf/util/hist.h | 2 + tools/perf/util/sort.c | 3 +- 4 files changed, 94 insertions(+), 48 deletions(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -849,7 +849,7 @@ static int hists__scnprintf_headers(char *buf, size_t size, struct hists *hists)if (perf_hpp__should_skip (fmt))continue ; -/* We need to add the length of the columns header. */ +/* 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));
tools/perf/ui/hist.c +89 -46
226 lines not on this page · raw message
tools/perf/util/hist.h +2 -0
@@ -207,6 +207,7 @@ struct perf_hpp_fmt {struct list_head list;struct list_head sort_list;bool elide; +int len; };extern struct list_head perf_hpp__list;
@@ -261,6 +262,7 @@ static inline bool perf_hpp__should_skip(struct perf_hpp_fmt *format) }void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists); +void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists);typedef u64 (*hpp_field_fn )(struct hist_entry *he);typedef int (*hpp_callback_fn )(struct perf_hpp *hpp,bool front);
tools/perf/util/sort.c +2 -1
@@ -1194,7 +1194,7 @@ bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)return hse_a->se == hse_b->se; } -void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists) +void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists) {struct hpp_sort_entry *hse;
@@ -1265,6 +1265,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)INIT_LIST_HEAD (&hse->hpp.list);INIT_LIST_HEAD (&hse->hpp.sort_list); hse->hpp.elide = false; + hse->hpp.len =0 ;return hse; }
Namhyung Kim
maintainerPATCH 4/8 perf report: Honor column width setting
In reply to Namhyung KimSet column width and do not change it if user gives -w/--column-widths option. It'll truncate longer symbols than the width if exists.
--- tools/perf/ui/browsers/hists.c | 18 +++++---- tools/perf/ui/gtk/hists.c | 10 ++--- tools/perf/ui/hist.c | 84 +++++++++++++++++++++++++++++------------- tools/perf/ui/stdio/hist.c | 4 +- tools/perf/util/hist.h | 14 ++++--- tools/perf/util/sort.c | 49 +++++++++++++++--------- 6 files changed, 116 insertions(+), 63 deletions(-)
tools/perf/ui/browsers/hists.c +11 -7
@@ -678,12 +678,12 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \ } \ \static int \ -hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ +hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, __hpp_get_##_field, " %*.2f%%", 6, \ - __hpp__slsmg_color_printf, true); \ + return hpp__fmt(fmt, hpp, he, __hpp_get_##_field, " %*.2f%%", \ + __hpp__slsmg_color_printf, true); \ }#define __HPP_COLOR_ACC_PERCENT_FN (_type, _field) \
@@ -693,19 +693,20 @@ static u64 __hpp_get_acc_##_field(struct hist_entry *he) \ } \ \static int \ -hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ +hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \if (!symbol_conf.cumulate_callchain) { \ +int len = fmt->user_len ?: fmt->len; \int ret =scnprintf (hpp->buf, hpp->size, \ -"%*s" ,8 ,"N/A" ); \ +"%*s" , len,"N/A" ); \slsmg_printf ("%s" , hpp->buf); \ \return ret; \ } \ - return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %*.2f%%", \ -6 , __hpp__slsmg_color_printf, true); \ + return hpp__fmt(fmt, hpp, he, __hpp_get_acc_##_field, \ +" %*.2f%%" , __hpp__slsmg_color_printf, true); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
@@ -1549,6 +1550,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,memset (options,0 ,sizeof (options)); +if (symbol_conf.col_width_list_str) +perf_hpp__set_user_width (symbol_conf.col_width_list_str); +while (1 ) {const struct thread *thread =NULL ;const struct dso *dso =NULL ;
tools/perf/ui/gtk/hists.c +5 -5
@@ -41,12 +41,12 @@ static u64 he_get_##_field(struct hist_entry *he) \return he->stat._field; \ } \ \ -static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ +static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \ - __percent_color_snprintf, true); \ + return hpp__fmt(fmt, hpp, he, he_get_##_field, " %*.2f%%", \ + __percent_color_snprintf, true); \ }#define __HPP_COLOR_ACC_PERCENT_FN (_type, _field) \
@@ -59,8 +59,8 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \ -__percent_color_snprintf ,true ); \ + return hpp__fmt_acc(fmt, hpp, he, he_get_acc_##_field, " %*.2f%%", \ +__percent_color_snprintf ,true ); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/hist.c +58 -26
141 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +3 -1
@@ -395,10 +395,12 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,init_rem_hits (); -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); +if (!show_header) goto print_entries;
tools/perf/util/hist.h +8 -6
@@ -208,6 +208,7 @@ struct perf_hpp_fmt {struct list_head sort_list;bool elide;int len; +int user_len; };extern struct list_head perf_hpp__list;
@@ -263,17 +264,18 @@ static inline bool perf_hpp__should_skip(struct perf_hpp_fmt *format)void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists);void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists); +void perf_hpp__set_user_width (const char *width_list_str);typedef u64 (*hpp_field_fn )(struct hist_entry *he);typedef int (*hpp_callback_fn )(struct perf_hpp *hpp,bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...); -int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt,int len, -hpp_snprint_fn print_fn,bool fmt_percent); -int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt,int len, -hpp_snprint_fn print_fn,bool fmt_percent); +int hpp__fmt (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he,hpp_field_fn get_field, +const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent); +int hpp__fmt_acc (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he,hpp_field_fn get_field, +const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc) {
tools/perf/util/sort.c +31 -18
132 lines not on this page · raw message
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf report: Honor column width setting
perf report: Honor column width setting
Commit-ID: 5b5916696051b88e63f3726cc3db44bf9561bad9 Gitweb: http://git.kernel.org/tip/5b5916696051b88e63f3726cc3db44bf9561bad9 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:38 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:06 -0300
perf report: Honor column width setting
Set column width and do not change it if user gives -w/--column-widths option. It'll truncate longer symbols than the width if exists.
--- tools/perf/ui/browsers/hists.c | 18 +++++---- tools/perf/ui/gtk/hists.c | 10 ++--- tools/perf/ui/hist.c | 84 +++++++++++++++++++++++++++++------------- tools/perf/ui/stdio/hist.c | 4 +- tools/perf/util/hist.h | 14 ++++--- tools/perf/util/sort.c | 49 +++++++++++++++--------- 6 files changed, 116 insertions(+), 63 deletions(-)
tools/perf/ui/browsers/hists.c +11 -7
@@ -678,12 +678,12 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \ } \ \static int \ -hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ +hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, __hpp_get_##_field, " %*.2f%%", 6, \ - __hpp__slsmg_color_printf, true); \ + return hpp__fmt(fmt, hpp, he, __hpp_get_##_field, " %*.2f%%", \ + __hpp__slsmg_color_printf, true); \ }#define __HPP_COLOR_ACC_PERCENT_FN (_type, _field) \
@@ -693,19 +693,20 @@ static u64 __hpp_get_acc_##_field(struct hist_entry *he) \ } \ \static int \ -hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\ +hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \if (!symbol_conf.cumulate_callchain) { \ +int len = fmt->user_len ?: fmt->len; \int ret =scnprintf (hpp->buf, hpp->size, \ -"%*s" ,8 ,"N/A" ); \ +"%*s" , len,"N/A" ); \slsmg_printf ("%s" , hpp->buf); \ \return ret; \ } \ - return __hpp__fmt(hpp, he, __hpp_get_acc_##_field, " %*.2f%%", \ -6 , __hpp__slsmg_color_printf, true); \ + return hpp__fmt(fmt, hpp, he, __hpp_get_acc_##_field, \ +" %*.2f%%" , __hpp__slsmg_color_printf, true); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
@@ -1549,6 +1550,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,memset (options,0 ,sizeof (options)); +if (symbol_conf.col_width_list_str) +perf_hpp__set_user_width (symbol_conf.col_width_list_str); +while (1 ) {const struct thread *thread =NULL ;const struct dso *dso =NULL ;
tools/perf/ui/gtk/hists.c +5 -5
@@ -41,12 +41,12 @@ static u64 he_get_##_field(struct hist_entry *he) \return he->stat._field; \ } \ \ -static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ +static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__fmt(hpp, he, he_get_##_field, " %*.2f%%", 6, \ - __percent_color_snprintf, true); \ + return hpp__fmt(fmt, hpp, he, he_get_##_field, " %*.2f%%", \ + __percent_color_snprintf, true); \ }#define __HPP_COLOR_ACC_PERCENT_FN (_type, _field) \
@@ -59,8 +59,8 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__fmt_acc(hpp, he, he_get_acc_##_field, " %*.2f%%", 6, \ -__percent_color_snprintf ,true ); \ + return hpp__fmt_acc(fmt, hpp, he, he_get_acc_##_field, " %*.2f%%", \ +__percent_color_snprintf ,true ); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/hist.c +58 -26
141 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +3 -1
@@ -395,10 +395,12 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,init_rem_hits (); -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); +if (!show_header) goto print_entries;
tools/perf/util/hist.h +8 -6
@@ -208,6 +208,7 @@ struct perf_hpp_fmt {struct list_head sort_list;bool elide;int len; +int user_len; };extern struct list_head perf_hpp__list;
@@ -263,17 +264,18 @@ static inline bool perf_hpp__should_skip(struct perf_hpp_fmt *format)void perf_hpp__reset_width (struct perf_hpp_fmt *fmt,struct hists *hists);void perf_hpp__reset_sort_width (struct perf_hpp_fmt *fmt,struct hists *hists); +void perf_hpp__set_user_width (const char *width_list_str);typedef u64 (*hpp_field_fn )(struct hist_entry *he);typedef int (*hpp_callback_fn )(struct perf_hpp *hpp,bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...); -int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt,int len, -hpp_snprint_fn print_fn,bool fmt_percent); -int __hpp__fmt_acc (struct perf_hpp *hpp,struct hist_entry *he, -hpp_field_fn get_field,const char *fmt,int len, -hpp_snprint_fn print_fn,bool fmt_percent); +int hpp__fmt (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he,hpp_field_fn get_field, +const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent); +int hpp__fmt_acc (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he,hpp_field_fn get_field, +const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc) {
tools/perf/util/sort.c +31 -18
132 lines not on this page · raw message
Namhyung Kim
maintainerPATCH 5/8 perf top: Add -w option for setting column width
In reply to Namhyung KimAdd -w/--column-widths option like perf report does so that users are able to see symbols even with some very long C++ library/functions. It can be a list separated by comma for each column.
$ perf top -w 0,20,30
The value of 0 means there's no limit.
--- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-top.txt | 6 ++++++ tools/perf/builtin-top.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-report.txt +1 -1
@@ -147,7 +147,7 @@ OPTIONS -w:: --column-widths=<width[,width...]>:: Force each column width to the provided list, for large terminal - readability. + readability. 0 means no limit (default behavior). -t:: --field-separator=::
tools/perf/Documentation/perf-top.txt +6 -0
@@ -193,6 +193,12 @@ Default is to monitor all CPUS. sum of shown entries will be always 100%. "absolute" means it retains the original value before and after the filter is applied. +-w:: +--column-widths=<width[,width...]>:: + Force each column width to the provided list, for large terminal + readability. 0 means no limit (default behavior). + + INTERACTIVE PROMPTING KEYS --------------------------
tools/perf/builtin-top.c +3 -0
@@ -1131,6 +1131,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) "Don't show entries under that percent", parse_percent_limit),OPT_CALLBACK (0 ,"percentage" ,NULL ,"relative|absolute" ,"How to display percentage of filtered entries" , parse_filter_percentage), +OPT_STRING ('w' ,"column-widths" , &symbol_conf.col_width_list_str, +"width[,width...]" , +"don't try to adjust column width, use these fixed values" ),OPT_END () }; const char * const top_usage[] = {
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf top: Add -w option for setting column width
perf top: Add -w option for setting column width
Commit-ID: cf59002fdebc9c00ee29233e65bc39dd69e0eaf6 Gitweb: http://git.kernel.org/tip/cf59002fdebc9c00ee29233e65bc39dd69e0eaf6 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:39 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:06 -0300
perf top: Add -w option for setting column width
Add -w/--column-widths option like perf report does so that users are able to see symbols even with some very long C++ library/functions.
It can be a list separated by comma for each column.
$ perf top -w 0,20,30
The value of 0 means there's no limit.
--- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-top.txt | 6 ++++++ tools/perf/builtin-top.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-report.txt +1 -1
@@ -147,7 +147,7 @@ OPTIONS -w:: --column-widths=<width[,width...]>:: Force each column width to the provided list, for large terminal - readability. + readability. 0 means no limit (default behavior). -t:: --field-separator=::
tools/perf/Documentation/perf-top.txt +6 -0
@@ -193,6 +193,12 @@ Default is to monitor all CPUS. sum of shown entries will be always 100%. "absolute" means it retains the original value before and after the filter is applied. +-w:: +--column-widths=<width[,width...]>:: + Force each column width to the provided list, for large terminal + readability. 0 means no limit (default behavior). + + INTERACTIVE PROMPTING KEYS --------------------------
tools/perf/builtin-top.c +3 -0
@@ -1131,6 +1131,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) "Don't show entries under that percent", parse_percent_limit),OPT_CALLBACK (0 ,"percentage" ,NULL ,"relative|absolute" ,"How to display percentage of filtered entries" , parse_filter_percentage), +OPT_STRING ('w' ,"column-widths" , &symbol_conf.col_width_list_str, +"width[,width...]" , +"don't try to adjust column width, use these fixed values" ),OPT_END () }; const char * const top_usage[] = {
Namhyung Kim
maintainerPATCH 6/8 perf tools: Add name field into perf_hpp_fmt
In reply to Namhyung KimIt makes the code a bit simpler and easier to debug IMHO.
I guess it can also remove similar code in perf diff, but let's keep it for a future work. :)
--- tools/perf/ui/gtk/hists.c | 4 +- tools/perf/ui/hist.c | 136 +++++++++++++++++++++------------------------- tools/perf/util/hist.h | 1 + tools/perf/util/sort.c | 6 +- 4 files changed, 66 insertions(+), 81 deletions(-)
tools/perf/ui/gtk/hists.c +1 -3
@@ -207,10 +207,8 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,if (perf_hpp__is_sort_entry (fmt)) sym_col = col_idx; - fmt->header (fmt, &hpp,hists_to_evsel (hists)); -gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), --1 ,ltrim (s), +-1 , fmt->name, renderer,"markup" , col_idx++,NULL ); }
tools/perf/ui/hist.c +61 -75
194 lines not on this page · raw message
tools/perf/util/hist.h +1 -0
@@ -192,6 +192,7 @@ struct perf_hpp { };struct perf_hpp_fmt { +const char *name;int (*header)(struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct perf_evsel *evsel); int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
tools/perf/util/sort.c +3 -3
@@ -1206,8 +1206,7 @@ void perf_hpp__reset_sort_width(struct perf_hpp_fmt *fmt, struct hists *hists)return ; hse = container_of(fmt, struct hpp_sort_entry, hpp); -hists__new_col_len (hists, hse->se->se_width_idx, -strlen (hse->se->se_header)); +hists__new_col_len (hists, hse->se->se_width_idx,strlen (fmt->name)); } static int __sort__hpp_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
@@ -1221,7 +1220,7 @@ static int __sort__hpp_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,if (!len) len =hists__col_len (&evsel->hists, hse->se->se_width_idx); -return scnprintf (hpp->buf, hpp->size,"%-*.*s" , len, len, hse->se->se_header); +return scnprintf (hpp->buf, hpp->size,"%-*.*s" , len, len, fmt->name); } static int __sort__hpp_width(struct perf_hpp_fmt *fmt,
@@ -1265,6 +1264,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd) } hse->se = sd->entry; + hse->hpp.name = sd->entry->se_header; hse->hpp.header = __sort__hpp_header; hse->hpp.width = __sort__hpp_width; hse->hpp.entry = __sort__hpp_entry;
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Add name field into perf_hpp_fmt
perf tools: Add name field into perf_hpp_fmt
Commit-ID: 1ecd44533a8a724f64d4305abb69836ca73c7390 Gitweb: http://git.kernel.org/tip/1ecd44533a8a724f64d4305abb69836ca73c7390 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:40 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:07 -0300
perf tools: Add name field into perf_hpp_fmt
It makes the code a bit simpler and easier to debug IMHO.
I guess it can also remove similar code in perf diff, but let's keep it for a future work. :)
--- tools/perf/ui/gtk/hists.c | 4 +- tools/perf/ui/hist.c | 136 +++++++++++++++++++++------------------------- tools/perf/util/hist.h | 1 + tools/perf/util/sort.c | 6 +- 4 files changed, 66 insertions(+), 81 deletions(-)
tools/perf/ui/gtk/hists.c +1 -3
@@ -207,10 +207,8 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,if (perf_hpp__is_sort_entry (fmt)) sym_col = col_idx; - fmt->header (fmt, &hpp,hists_to_evsel (hists)); -gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), --1 ,ltrim (s), +-1 , fmt->name, renderer,"markup" , col_idx++,NULL ); }
tools/perf/ui/hist.c +61 -75
194 lines not on this page · raw message
tools/perf/util/hist.h +1 -0
@@ -192,6 +192,7 @@ struct perf_hpp { };struct perf_hpp_fmt { +const char *name;int (*header)(struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct perf_evsel *evsel); int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
tools/perf/util/sort.c +3 -3
@@ -1206,8 +1206,7 @@ void perf_hpp__reset_sort_width(struct perf_hpp_fmt *fmt, struct hists *hists)return ; hse = container_of(fmt, struct hpp_sort_entry, hpp); -hists__new_col_len (hists, hse->se->se_width_idx, -strlen (hse->se->se_header)); +hists__new_col_len (hists, hse->se->se_width_idx,strlen (fmt->name)); } static int __sort__hpp_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
@@ -1221,7 +1220,7 @@ static int __sort__hpp_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,if (!len) len =hists__col_len (&evsel->hists, hse->se->se_width_idx); -return scnprintf (hpp->buf, hpp->size,"%-*.*s" , len, len, hse->se->se_header); +return scnprintf (hpp->buf, hpp->size,"%-*.*s" , len, len, fmt->name); } static int __sort__hpp_width(struct perf_hpp_fmt *fmt,
@@ -1265,6 +1264,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd) } hse->se = sd->entry; + hse->hpp.name = sd->entry->se_header; hse->hpp.header = __sort__hpp_header; hse->hpp.width = __sort__hpp_width; hse->hpp.entry = __sort__hpp_entry;
Namhyung Kim
maintainerPATCH 7/8 perf tools: Fix column alignment when headers aren't shown on TUI
In reply to Namhyung KimIf 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.
--- tools/perf/ui/browsers/hists.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/ui/browsers/hists.c +4 -3
@@ -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);
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Fix column alignment when headers aren't shown on TUI
perf tools: Fix column alignment when headers aren't shown on TUI
Commit-ID: 59dc9f2534569d11a55c8b5dbe93c36f2b2fa506 Gitweb: http://git.kernel.org/tip/59dc9f2534569d11a55c8b5dbe93c36f2b2fa506 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:41 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:03:07 -0300
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.
--- tools/perf/ui/browsers/hists.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/ui/browsers/hists.c +4 -3
@@ -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);
Namhyung Kim
maintainerPATCH 8/8 perf symbol: Don't demangle parameters and such by default
In reply to Namhyung KimSome C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
This patch passes DMGL_NO_OPTS by default when calling bfd_demangle(). One can still see full symbols with -v/--verbose option.
before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)
after:
JS_CallFunctionValue
--- tools/perf/util/symbol-elf.c | 7 +++++-- tools/perf/util/symbol.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
tools/perf/util/symbol-elf.c +5 -2
@@ -939,8 +939,11 @@ new_symbol:* to it... */ if (symbol_conf.demangle) { - demangled =bfd_demangle (NULL , elf_name, -DMGL_PARAMS |DMGL_ANSI ); +int demangle_flags =DMGL_NO_OPTS ; +if (verbose) + demangle_flags =DMGL_PARAMS |DMGL_ANSI ; + + demangled =bfd_demangle (NULL , elf_name, demangle_flags);if (demangled !=NULL ) elf_name = demangled; }
tools/perf/util/symbol.h +1 -0
@@ -59,6 +59,7 @@ extern Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,#endif #ifndef DMGL_PARAMS +#define DMGL_NO_OPTS 0/* For readability... */ #define DMGL_PARAMS (1 << 0)/* Include function args */ #define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */ #endif
Signature · 1 line
2.0.0
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 8/8] perf symbol: Don't demangle parameters and such by default
Em Thu, Jul 31, 2014 at 02:47:42PM +0900, Namhyung Kim escreveu:
Quoted 4 lines
Some C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
Quoted 8 lines
This patch passes
DMGL_NO_OPTSby default when callingbfd_demangle(). One can still see full symbols with -v/--verbose option.before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)after:
JS_CallFunctionValue
Are you sure we want that?
With this we'll end up having different instantiations having the same name, since the way to differentiate them is exactly by a different parameter list, no?
- Arnaldo
Quoted 38 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol-elf.c | 7 +++++-- tools/perf/util/symbol.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)tools/perf/util/symbol-elf.c +5
-2@@ -939,8 +939,11 @@ new_symbol:* to it... */ if (symbol_conf.demangle) { - demangled =bfd_demangle (NULL , elf_name, -DMGL_PARAMS |DMGL_ANSI ); +int demangle_flags =DMGL_NO_OPTS ; +if (verbose) + demangle_flags =DMGL_PARAMS |DMGL_ANSI ; + + demangled =bfd_demangle (NULL , elf_name, demangle_flags);if (demangled !=NULL ) elf_name = demangled; }tools/perf/util/symbol.h +1
-0@@ -59,6 +59,7 @@ extern Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,#endif #ifndef DMGL_PARAMS +#define DMGL_NO_OPTS 0/* For readability... */ #define DMGL_PARAMS (1 << 0)/* Include function args */ #define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */ #endif Signature · 1 line
2.0.0
Namhyung Kim
maintainerRe: [PATCH 8/8] perf symbol: Don't demangle parameters and such by default
Quoted 11 lines · Arnaldo Carvalho de Melo
Em Thu, Jul 31, 2014 at 02:47:42PM +0900, Namhyung Kim escreveu:
Quoted 10 lines
Some C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
This patch passes
DMGL_NO_OPTSby default when callingbfd_demangle(). One can still see full symbols with -v/--verbose option.before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)
Quoted 8 lines
Quoted 2 lines
after:
JS_CallFunctionValueAre you sure we want that?
With this we'll end up having different instantiations having the same name, since the way to differentiate them is exactly by a different parameter list, no?
Right, but I think it's not a big problem since such overloaded functions will not be shown at the same time as only one of them might do the real work most cases. Simply noticing one of them is a performance bottle neck would be helpful to the developer, I guess. Even if it's not the case, one still can see and identify the correct one using the -v option.
For me, it's just annoying when (unimportant) C++ symbols occupy too much space in a limited terminal width.
Thanks,
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 8/8] perf symbol: Don't demangle parameters and such by default
Em Mon, Aug 11, 2014 at 05:17:37PM +0900, Namhyung Kim escreveu:
Quoted 17 lines · Arnaldo Carvalho de Melo
Quoted 15 lines
Em Thu, Jul 31, 2014 at 02:47:42PM +0900, Namhyung Kim escreveu:
Quoted 4 lines
Some C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
Quoted 8 lines
This patch passes
DMGL_NO_OPTSby default when callingbfd_demangle(). One can still see full symbols with -v/--verbose option.before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)after:
JS_CallFunctionValueAre you sure we want that?
Quoted 7 lines
Quoted 3 lines
With this we'll end up having different instantiations having the same name, since the way to differentiate them is exactly by a different parameter list, no?
Right, but I think it's not a big problem since such overloaded functions will not be shown at the same time as only one of them might do the real work most cases. Simply noticing one of them is a
But then only someone that has deep knowledge of the code in question will figure that out from just the function name.
A way to toggle that, starting with a sane value, in this case probably not showing the parameter listing due to it being overly long would be ideal.
Perhaps I can process this patch now and leave this toggling of things that --verbose shows to a second patchset, where this and --show-total-period, --show-nr-samples, --hide-unresolved, even annotation stuff needs to be on-the-fly togglable, like --disassembly-style.
Quoted 6 lines
performance bottle neck would be helpful to the developer, I guess. Even if it's not the case, one still can see and identify the correct one using the -v option.
For me, it's just annoying when (unimportant) C++ symbols occupy too much space in a limited terminal width.
What is annoying/unimportant to a person may be the missing detail for someone else.
Not having to restart a possibly long top/report session from scratch looks like a nice feature to have.
I'll take the patch, its just one more thing that gets in the --verbose grab bag till we make all on-the-fly togglable.
- Arnaldo
Namhyung Kim
maintainerRe: [PATCH 8/8] perf symbol: Don't demangle parameters and such by default
Hi Arnaldo,
Quoted 46 lines · Arnaldo Carvalho de Melo
Em Mon, Aug 11, 2014 at 05:17:37PM +0900, Namhyung Kim escreveu:
Quoted 17 lines · Arnaldo Carvalho de Melo
Quoted 15 lines
Em Thu, Jul 31, 2014 at 02:47:42PM +0900, Namhyung Kim escreveu:
Quoted 4 lines
Some C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
Quoted 8 lines
This patch passes
DMGL_NO_OPTSby default when callingbfd_demangle(). One can still see full symbols with -v/--verbose option.before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)after:
JS_CallFunctionValueAre you sure we want that?
Quoted 7 lines
Quoted 3 lines
With this we'll end up having different instantiations having the same name, since the way to differentiate them is exactly by a different parameter list, no?
Right, but I think it's not a big problem since such overloaded functions will not be shown at the same time as only one of them might do the real work most cases. Simply noticing one of them is a
But then only someone that has deep knowledge of the code in question will figure that out from just the function name.
A way to toggle that, starting with a sane value, in this case probably not showing the parameter listing due to it being overly long would be ideal.
Perhaps I can process this patch now and leave this toggling of things that --verbose shows to a second patchset, where this and --show-total-period, --show-nr-samples, --hide-unresolved, even annotation stuff needs to be on-the-fly togglable, like --disassembly-style.
Quoted 6 lines
performance bottle neck would be helpful to the developer, I guess. Even if it's not the case, one still can see and identify the correct one using the -v option.
For me, it's just annoying when (unimportant) C++ symbols occupy too much space in a limited terminal width.
Quoted 8 lines
What is annoying/unimportant to a person may be the missing detail for someone else.
Not having to restart a possibly long top/report session from scratch looks like a nice feature to have.
I'll take the patch, its just one more thing that gets in the --verbose grab bag till we make all on-the-fly togglable.
Thanks, I'll think about the toggling later. :)
Thanks,
Namhyung
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf symbols: Don' t demangle parameters and such by default
In reply to Namhyung Kimperf symbols: Don't demangle parameters and such by default
Commit-ID: e71e79457b79a52827039d9d7f253321bfd342bd Gitweb: http://git.kernel.org/tip/e71e79457b79a52827039d9d7f253321bfd342bd Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 31 Jul 2014 14:47:42 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 13 Aug 2014 17:39:25 -0300
perf symbols: Don't demangle parameters and such by default
Some C++ symbols have very long name and they make column length longer. Most of them are about parameters including templates and we can ignore such info most of time IMHO.
This patch passes DMGL_NO_OPTS by default when calling bfd_demangle(). One can still see full symbols with -v/--verbose option.
before:
JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)
after:
JS_CallFunctionValue
--- tools/perf/util/symbol-elf.c | 7 +++++-- tools/perf/util/symbol.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
tools/perf/util/symbol-elf.c +5 -2
@@ -939,8 +939,11 @@ new_symbol:* to it... */ if (symbol_conf.demangle) { - demangled =bfd_demangle (NULL , elf_name, -DMGL_PARAMS |DMGL_ANSI ); +int demangle_flags =DMGL_NO_OPTS ; +if (verbose) + demangle_flags =DMGL_PARAMS |DMGL_ANSI ; + + demangled =bfd_demangle (NULL , elf_name, demangle_flags);if (demangled !=NULL ) elf_name = demangled; }
tools/perf/util/symbol.h +1 -0
@@ -60,6 +60,7 @@ extern Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,#endif #ifndef DMGL_PARAMS +#define DMGL_NO_OPTS 0/* For readability... */ #define DMGL_PARAMS (1 << 0)/* Include function args */ #define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */ #endif