perf tools: Update on filtered entries' percentage output (v6)
Namhyung Kim
maintainercover perf tools: Update on filtered entries' percentage output (v6)
Hello,
I added --percentage option to perf report to control display of percentage of filtered entries.
usage: perf report [<options>]
--percentage <relative|absolute>
how to display percentage of filtered entries
"relative" means it's relative to filtered entries only so that the sum of shown entries will be always 100%. "absolute" means it retains original value before and after the filter applied. In patch 8/8, I made the "absolute" as default since it makes more sense IMHO.
$ perf report -s comm
# Overhead Command
# ........ ............
#
74.19% cc1
7.61% gcc
6.11% as
4.35% sh
4.14% make
1.13% fixdep
... $ perf report -s comm -c cc1,gcc --percentage absolute
# Overhead Command
# ........ ............
#
74.19% cc1
7.61% gcc $ perf report -s comm -c cc1,gcc --percentage relative
# Overhead Command
# ........ ............
#
90.69% cc1
9.31% gccNote that it has zero effect if no filter was applied.
* changes in v6:
- fix a bug in --stdio group report
- reuse __hpp__fmt() function in TUI/GTK
- add Acked-by from Jiri
* changes in v5:
- fix 0 samples in relative percent output (Jiri)
- factor hists__total_period function (Jiri)
- share config parsing code with option parser (Jiri)
* changes in v4:
- support perf top and perf diff also (Jiri)
- add HIST_FILTER__HOST/GUEST (Jiri)
- retain both of filtered and total stats (Arnaldo)
- add 'F' hotkey on TUI (Jiri)
- rename config variable to have "hist." prefix
You can get this on the 'perf/percentage-v6' branch in my tree
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Any comments are welcome, thanks
Namhyung
Namhyung Kim (13):
perf ui/stdio: Fix invalid output on event group report perf ui/gtk: Reuse generic __hpp__fmt() code
perf ui/hists: Pass struct hpp to print functions perf ui/tui: Reuse generic __hpp__fmt() code
perf tools: Pass evsel to hpp->header/width functions explicitly perf tools: Count periods of filtered entries separately perf hists: Add support for showing relative percentage perf report: Add --percentage option
perf top: Add --percentage option
perf diff: Add --percentage option
perf tools: Add hist.percentage config option
perf ui/tui: Add 'F' hotkey to toggle percentage output perf tools: Show absolute percentage by default
tools/perf/Documentation/perf-diff.txt | 21 +++- tools/perf/Documentation/perf-report.txt | 24 +++-- tools/perf/Documentation/perf-top.txt | 18 +++- tools/perf/builtin-diff.c | 42 ++++++-- tools/perf/builtin-report.c | 24 ++++- tools/perf/builtin-top.c | 2 + tools/perf/ui/browsers/hists.c | 161 ++++++++++++++----------------- tools/perf/ui/gtk/hists.c | 89 ++++------------- tools/perf/ui/hist.c | 159 ++++++++++++++++++++---------- tools/perf/ui/stdio/hist.c | 11 +-- tools/perf/util/config.c | 4 + tools/perf/util/event.c | 22 ++--- tools/perf/util/hist.c | 65 +++++++++---- tools/perf/util/hist.h | 39 +++++++- tools/perf/util/symbol.h | 5 +- 15 files changed, 406 insertions(+), 280 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/13 perf ui/stdio: Fix invalid output on event group report
When some of group member has 0 overhead, it printed previous percentage instead of 0.00%. It's because passing integer 0 as a percent rather than double 0.0 so the remaining bits came from garbage. The TUI and GTK don't have this problem since they pass 0.0.
Before:
# Samples: 845 of event 'anon group { cycles, cache-references, cache-misses }' # Event count (approx.): 174775051
#
# Overhead Samples
# ........................ ....................................
#
20.32% 8.58% 73.51% 45 30 138
6.87% 6.87% 6.87% 21 0 0
5.29% 0.31% 0.31% 10 1 0
1.89% 1.89% 1.89% 6 0 0
1.76% 1.76% 1.76% 2 0 0After:
# Overhead Samples
# ........................ ....................................
#
20.32% 8.58% 73.51% 45 30 138
6.87% 0.00% 0.00% 21 0 0
5.29% 0.31% 0.00% 10 1 0
1.89% 0.00% 0.00% 6 0 0
1.76% 0.00% 0.00% 2 0 0--- tools/perf/ui/hist.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tools/perf/ui/hist.c +16 -4
@@ -52,8 +52,15 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,* zero-fill group members in the middle which * have no sample */ - ret +=print_fn (hpp->buf + ret, hpp->size - ret, - fmt,0 ); +if (fmt_percent) { + ret +=print_fn (hpp->buf + ret, + hpp->size - ret, + fmt,0.0 ); + }else { + ret +=print_fn (hpp->buf + ret, + hpp->size - ret, + fmt,0ULL ); + } }if (fmt_percent)
@@ -72,8 +79,13 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,/* * zero-fill group members at last which have no sample */ - ret +=print_fn (hpp->buf + ret, hpp->size - ret, - fmt,0 ); +if (fmt_percent) { + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + }else { + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0ULL ); + } } }return ret;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf ui/stdio: Fix invalid output on event group report
perf ui/stdio: Fix invalid output on event group report
Commit-ID: 9b0d2fb86d4737b2cda39bc9c9a8e368cec38960 Gitweb: http://git.kernel.org/tip/9b0d2fb86d4737b2cda39bc9c9a8e368cec38960 Author: Namhyung Kim <[email protected]> AuthorDate: Mon, 3 Mar 2014 10:14:02 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Mar 2014 18:08:37 -0300
perf ui/stdio: Fix invalid output on event group report
When some of group member has 0 overhead, it printed previous percentage instead of 0.00%. It's because passing integer 0 as a percent rather than double 0.0 so the remaining bits came from garbage. The TUI and GTK don't have this problem since they pass 0.0.
Before:
# Samples: 845 of event 'anon group { cycles, cache-references, cache-misses }' # Event count (approx.): 174775051
#
# Overhead Samples
# ........................ ....................................
#
20.32% 8.58% 73.51% 45 30 138
6.87% 6.87% 6.87% 21 0 0
5.29% 0.31% 0.31% 10 1 0
1.89% 1.89% 1.89% 6 0 0
1.76% 1.76% 1.76% 2 0 0After:
# Overhead Samples
# ........................ ....................................
#
20.32% 8.58% 73.51% 45 30 138
6.87% 0.00% 0.00% 21 0 0
5.29% 0.31% 0.00% 10 1 0
1.89% 0.00% 0.00% 6 0 0
1.76% 0.00% 0.00% 2 0 0--- tools/perf/ui/hist.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tools/perf/ui/hist.c +16 -4
@@ -52,8 +52,15 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,* zero-fill group members in the middle which * have no sample */ - ret +=print_fn (hpp->buf + ret, hpp->size - ret, - fmt,0 ); +if (fmt_percent) { + ret +=print_fn (hpp->buf + ret, + hpp->size - ret, + fmt,0.0 ); + }else { + ret +=print_fn (hpp->buf + ret, + hpp->size - ret, + fmt,0ULL ); + } }if (fmt_percent)
@@ -72,8 +79,13 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,/* * zero-fill group members at last which have no sample */ - ret +=print_fn (hpp->buf + ret, hpp->size - ret, - fmt,0 ); +if (fmt_percent) { + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + }else { + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0ULL ); + } } }return ret;
Namhyung Kim
maintainerPATCH 2/13 perf ui/gtk: Reuse generic __hpp__fmt() code
In reply to Namhyung KimThe __hpp__color_fmt used in the gtk code can be replace by the generic code with small change in print_fn callback.
This is a preparation to upcoming changes and no functional changes intended.
--- tools/perf/ui/gtk/hists.c | 73 +++++++---------------------------------------- tools/perf/ui/hist.c | 9 ++---- tools/perf/util/hist.h | 6 ++++ 3 files changed, 19 insertions(+), 69 deletions(-)
tools/perf/ui/gtk/hists.c +10 -63
@@ -8,16 +8,22 @@#define MAX_COLUMNS 32 -static int __percent_color_snprintf (char *buf,size_t size,double percent) +static int __percent_color_snprintf (char *buf,size_t size,const char *fmt, ...) {int ret =0 ; +va_list args; +double percent;const char *markup; +va_start (args, fmt); + percent =va_arg (args, double); +va_end (args); + markup =perf_gtk__get_percent_color (percent);if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret," %6.2f%%" , percent); + ret +=scnprintf (buf + ret, size - ret, fmt, percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -25,66 +31,6 @@ static int __percent_color_snprintf(char *buf, size_t size, double percent)return ret; } - -static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *)) -{ -int ret; -double percent =0.0 ; -struct hists *hists = he->hists; -struct perf_evsel *evsel =hists_to_evsel (hists); - -if (hists->stats.total_period) - percent =100.0 *get_field (he) / hists->stats.total_period; - - ret =__percent_color_snprintf (hpp->buf, hpp->size, percent); - -if (perf_evsel__is_group_event (evsel)) { -int prev_idx, idx_delta; -struct hist_entry *pair; -int nr_members = evsel->nr_members; - - prev_idx =perf_evsel__group_idx (evsel); - -list_for_each_entry (pair, &he->pairs.head, pairs.node) { -u64 period =get_field (pair); -u64 total = pair->hists->stats.total_period; - - evsel =hists_to_evsel (pair->hists); - idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; - -while (idx_delta--) { -/* -* zero-fill group members in the middle which -* have no sample -*/ - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, -0.0 ); - } - - percent =100.0 * period / total; - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, - percent); - - prev_idx =perf_evsel__group_idx (evsel); - } - - idx_delta = nr_members - prev_idx -1 ; - -while (idx_delta--) { -/* -* zero-fill group members at last which have no sample -*/ - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, -0.0 ); - } - } -return ret; -} -#define __HPP_COLOR_PERCENT_FN (_type, _field) \ static u64 he_get_##_field(struct hist_entry *he) \ { \
@@ -95,7 +41,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__color_fmt(hpp, he, he_get_##_field); \ + return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ +__percent_color_snprintf ,true ); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/hist.c +3 -6
@@ -8,12 +8,9 @@/* hist period print (hpp) functions */ -typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); - -static int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), -const char *fmt,hpp_snprint_fn print_fn, -bool fmt_percent) +int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent) {int ret;struct hists *hists = he->hists;
tools/perf/util/hist.h +6 -0
@@ -166,6 +166,12 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); +typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); + +int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent); +static inline size_t perf_hpp__use_color (void ) {return !symbol_conf.field_sep;
Signature · 1 line
1.7.11.7
Re: [PATCH 02/13] perf ui/gtk: Reuse generic __hpp__fmt() code
Quoted 9 lines · Namhyung Kim
The
__hpp__color_fmtused in the gtk code can be replace by the generic code with small change inprint_fncallback.This is a preparation to upcoming changes and no functional changes intended.
Cc Jiri Olsa <[email protected]>Cc Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf ui/gtk: Reuse generic __hpp__fmt() code
In reply to Namhyung Kimperf ui/gtk: Reuse generic __hpp__fmt() code
Commit-ID: 4a62109fe94f68a57b239c1516f97497a4d15c14 Gitweb: http://git.kernel.org/tip/4a62109fe94f68a57b239c1516f97497a4d15c14 Author: Namhyung Kim <[email protected]> AuthorDate: Mon, 3 Mar 2014 10:14:03 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Mar 2014 18:08:38 -0300
perf ui/gtk: Reuse generic __hpp__fmt() code
The __hpp__color_fmt used in the gtk code can be replace by the generic code with small change in print_fn callback.
This is a preparation to upcoming changes and no functional changes intended.
--- tools/perf/ui/gtk/hists.c | 73 +++++++---------------------------------------- tools/perf/ui/hist.c | 9 ++---- tools/perf/util/hist.h | 6 ++++ 3 files changed, 19 insertions(+), 69 deletions(-)
tools/perf/ui/gtk/hists.c +10 -63
@@ -8,16 +8,22 @@#define MAX_COLUMNS 32 -static int __percent_color_snprintf (char *buf,size_t size,double percent) +static int __percent_color_snprintf (char *buf,size_t size,const char *fmt, ...) {int ret =0 ; +va_list args; +double percent;const char *markup; +va_start (args, fmt); + percent =va_arg (args, double); +va_end (args); + markup =perf_gtk__get_percent_color (percent);if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret," %6.2f%%" , percent); + ret +=scnprintf (buf + ret, size - ret, fmt, percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -25,66 +31,6 @@ static int __percent_color_snprintf(char *buf, size_t size, double percent)return ret; } - -static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *)) -{ -int ret; -double percent =0.0 ; -struct hists *hists = he->hists; -struct perf_evsel *evsel =hists_to_evsel (hists); - -if (hists->stats.total_period) - percent =100.0 *get_field (he) / hists->stats.total_period; - - ret =__percent_color_snprintf (hpp->buf, hpp->size, percent); - -if (perf_evsel__is_group_event (evsel)) { -int prev_idx, idx_delta; -struct hist_entry *pair; -int nr_members = evsel->nr_members; - - prev_idx =perf_evsel__group_idx (evsel); - -list_for_each_entry (pair, &he->pairs.head, pairs.node) { -u64 period =get_field (pair); -u64 total = pair->hists->stats.total_period; - - evsel =hists_to_evsel (pair->hists); - idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; - -while (idx_delta--) { -/* -* zero-fill group members in the middle which -* have no sample -*/ - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, -0.0 ); - } - - percent =100.0 * period / total; - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, - percent); - - prev_idx =perf_evsel__group_idx (evsel); - } - - idx_delta = nr_members - prev_idx -1 ; - -while (idx_delta--) { -/* -* zero-fill group members at last which have no sample -*/ - ret +=__percent_color_snprintf (hpp->buf + ret, - hpp->size - ret, -0.0 ); - } - } -return ret; -} -#define __HPP_COLOR_PERCENT_FN (_type, _field) \ static u64 he_get_##_field(struct hist_entry *he) \ { \
@@ -95,7 +41,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__color_fmt(hpp, he, he_get_##_field); \ + return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ +__percent_color_snprintf ,true ); \ }__HPP_COLOR_PERCENT_FN (overhead, period)
tools/perf/ui/hist.c +3 -6
@@ -8,12 +8,9 @@/* hist period print (hpp) functions */ -typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); - -static int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), -const char *fmt,hpp_snprint_fn print_fn, -bool fmt_percent) +int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent) {int ret;struct hists *hists = he->hists;
tools/perf/util/hist.h +6 -0
@@ -166,6 +166,12 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); +typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); + +int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent); +static inline size_t perf_hpp__use_color (void ) {return !symbol_conf.field_sep;
Namhyung Kim
maintainerPATCH 3/13 perf ui/hists: Pass struct hpp to print functions
In reply to Namhyung KimInstead of the pointer to buffer and its size so that it can also get private argument passed along with hpp.
This is a preparation of further change.
--- tools/perf/ui/gtk/hists.c | 4 ++- tools/perf/ui/hist.c | 87 +++++++++++++++++++++++++++++++++++----------- tools/perf/ui/stdio/hist.c | 6 ---- tools/perf/util/hist.h | 8 ++++- 4 files changed, 76 insertions(+), 29 deletions(-)
tools/perf/ui/gtk/hists.c +3 -1
@@ -8,12 +8,14 @@#define MAX_COLUMNS 32 -static int __percent_color_snprintf (char *buf,size_t size,const char *fmt, ...) +static int __percent_color_snprintf (struct perf_hpp *hpp,const char *fmt, ...) {int ret =0 ;va_list args;double percent;const char *markup; +char *buf = hpp->buf; +size_t size = hpp->size;va_start (args, fmt); percent =va_arg (args, double);
tools/perf/ui/hist.c +66 -21
150 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +0 -6
@@ -306,12 +306,6 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,return hist_entry_callchain__fprintf (he, total_period, left_margin, fp); } -static inline void advance_hpp (struct perf_hpp *hpp,int inc) -{ - hpp->buf += inc; - hpp->size -= inc; -} -static int hist_entry__period_snprintf (struct perf_hpp *hpp,struct hist_entry *he) {
tools/perf/util/hist.h +7 -1
@@ -166,12 +166,18 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); -typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); +typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he,u64 (*get_field)(struct hist_entry *),const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent); +static inline void advance_hpp (struct perf_hpp *hpp,int inc) +{ + hpp->buf += inc; + hpp->size -= inc; +} +static inline size_t perf_hpp__use_color (void ) {return !symbol_conf.field_sep;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf ui/hists: Pass struct hpp to print functions
perf ui/hists: Pass struct hpp to print functions
Commit-ID: a0088adcd651b8eb1a9ca9c7e6ebe1c2c5fb6273 Gitweb: http://git.kernel.org/tip/a0088adcd651b8eb1a9ca9c7e6ebe1c2c5fb6273 Author: Namhyung Kim <[email protected]> AuthorDate: Mon, 3 Mar 2014 10:14:04 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Mar 2014 18:08:38 -0300
perf ui/hists: Pass struct hpp to print functions
Instead of the pointer to buffer and its size so that it can also get private argument passed along with hpp.
This is a preparation of further change.
--- tools/perf/ui/gtk/hists.c | 4 ++- tools/perf/ui/hist.c | 87 +++++++++++++++++++++++++++++++++++----------- tools/perf/ui/stdio/hist.c | 6 ---- tools/perf/util/hist.h | 8 ++++- 4 files changed, 76 insertions(+), 29 deletions(-)
tools/perf/ui/gtk/hists.c +3 -1
@@ -8,12 +8,14 @@#define MAX_COLUMNS 32 -static int __percent_color_snprintf (char *buf,size_t size,const char *fmt, ...) +static int __percent_color_snprintf (struct perf_hpp *hpp,const char *fmt, ...) {int ret =0 ;va_list args;double percent;const char *markup; +char *buf = hpp->buf; +size_t size = hpp->size;va_start (args, fmt); percent =va_arg (args, double);
tools/perf/ui/hist.c +66 -21
150 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +0 -6
@@ -306,12 +306,6 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,return hist_entry_callchain__fprintf (he, total_period, left_margin, fp); } -static inline void advance_hpp (struct perf_hpp *hpp,int inc) -{ - hpp->buf += inc; - hpp->size -= inc; -} -static int hist_entry__period_snprintf (struct perf_hpp *hpp,struct hist_entry *he) {
tools/perf/util/hist.h +7 -1
@@ -166,12 +166,18 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); -typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); +typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he,u64 (*get_field)(struct hist_entry *),const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent); +static inline void advance_hpp (struct perf_hpp *hpp,int inc) +{ + hpp->buf += inc; + hpp->size -= inc; +} +static inline size_t perf_hpp__use_color (void ) {return !symbol_conf.field_sep;
Namhyung Kim
maintainerPATCH 4/13 perf ui/tui: Reuse generic __hpp__fmt() code
In reply to Namhyung KimThe __hpp__color_fmt used in the TUI code can be replace by the generic code with small change in print_fn callback. And it also needs to move callback function to the generic __hpp__fmt().
No functional changes intended.
--- tools/perf/ui/browsers/hists.c | 122 ++++++++++++++--------------------------- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/ui/hist.c | 26 ++++++--- tools/perf/util/hist.h | 4 +- 4 files changed, 63 insertions(+), 91 deletions(-)
tools/perf/ui/browsers/hists.c +40 -82
@@ -587,95 +587,52 @@ struct hpp_arg {bool current_entry; }; -static int __hpp__color_callchain (struct hpp_arg *arg) +static int __hpp__overhead_callback (struct perf_hpp *hpp,bool front) { -if (!symbol_conf.use_callchain) -return 0 ; - -slsmg_printf ("%c " , arg->folded_sign); -return 2 ; -} - -static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), -int (*callchain_cb)(struct hpp_arg *)) -{ -int ret =0 ; -double percent =0.0 ; -struct hists *hists = he->hists;struct hpp_arg *arg = hpp->ptr; -if (hists->stats.total_period) - percent =100.0 *get_field (he) / hists->stats.total_period; - -ui_browser__set_percent_color (arg->b, percent, arg->current_entry); - -if (callchain_cb) - ret +=callchain_cb (arg); - - ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); -slsmg_printf ("%s" , hpp->buf); - -if (symbol_conf.event_group) { -int prev_idx, idx_delta; -struct perf_evsel *evsel =hists_to_evsel (hists); -struct hist_entry *pair; -int nr_members = evsel->nr_members; - -if (nr_members <=1 ) - goto out; +if (arg->current_entry && arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_SELECTED ); +else +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); - prev_idx =perf_evsel__group_idx (evsel); +if (front) { +if (!symbol_conf.use_callchain) +return 0 ; -list_for_each_entry (pair, &he->pairs.head, pairs.node) { -u64 period =get_field (pair); -u64 total = pair->hists->stats.total_period; +slsmg_printf ("%c " , arg->folded_sign); +return 2 ; + } -if (!total) -continue ; +return 0 ; +} - evsel =hists_to_evsel (pair->hists); - idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; +static int __hpp__color_callback (struct perf_hpp *hpp,bool front__maybe_unused ) +{ +struct hpp_arg *arg = hpp->ptr; -while (idx_delta--) { -/* -* zero-fill group members in the middle which -* have no sample -*/ -ui_browser__set_percent_color (arg->b,0.0 , - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" ,0.0 ); -slsmg_printf ("%s" , hpp->buf); - } +if (!arg->current_entry || !arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); +return 0 ; +} - percent =100.0 * period / total; -ui_browser__set_percent_color (arg->b, percent, - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" , percent); -slsmg_printf ("%s" , hpp->buf); +static int __hpp__slsmg_color_printf (struct perf_hpp *hpp,const char *fmt, ...) +{ +struct hpp_arg *arg = hpp->ptr; +int ret; +va_list args; +double percent; - prev_idx =perf_evsel__group_idx (evsel); - } +va_start (args, fmt); + percent =va_arg (args, double); +va_end (args); - idx_delta = nr_members - prev_idx -1 ; +ui_browser__set_percent_color (arg->b, percent, arg->current_entry); -while (idx_delta--) { -/* -* zero-fill group members at last which have no sample -*/ -ui_browser__set_percent_color (arg->b,0.0 , - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" ,0.0 ); -slsmg_printf ("%s" , hpp->buf); - } - } -out: -if (!arg->current_entry || !arg->b->navkeypressed) -ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); + ret =scnprintf (hpp->buf, hpp->size, fmt, percent); +slsmg_printf ("%s" , hpp->buf); +advance_hpp (hpp, ret);return ret; }
@@ -690,14 +647,15 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \ + return __hpp__fmt(hpp, he, __hpp_get_##_field, _cb, " %6.2f%%", \ +__hpp__slsmg_color_printf ,true ); \ } -__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__color_callchain) -__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, NULL) -__HPP_COLOR_PERCENT_FN(overhead_us, period_us, NULL) -__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, NULL) -__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, NULL) +__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__overhead_callback) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, __hpp__color_callback)#undef __HPP_COLOR_PERCENT_FN
tools/perf/ui/gtk/hists.c +1 -1
@@ -43,7 +43,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, NULL, " %6.2f%%", \__percent_color_snprintf ,true ); \ }
tools/perf/ui/hist.c +19 -7
@@ -16,15 +16,20 @@ })int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), +hpp_field_fn get_field,hpp_callback_fn callback,const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent) { -int ret; +int ret =0 ;struct hists *hists = he->hists;struct perf_evsel *evsel =hists_to_evsel (hists);char *buf = hpp->buf;size_t size = hpp->size; +if (callback) { + ret =callback (hpp, true); +advance_hpp (hpp, ret); + } +if (fmt_percent) {double percent =0.0 ;
@@ -32,9 +37,9 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, percent =100.0 *get_field (he) / hists->stats.total_period; - ret =hpp__call_print_fn (hpp, print_fn, fmt, percent); + ret +=hpp__call_print_fn (hpp, print_fn, fmt, percent); }else - ret =hpp__call_print_fn (hpp, print_fn, fmt,get_field (he)); + ret +=hpp__call_print_fn (hpp, print_fn, fmt,get_field (he));if (perf_evsel__is_group_event (evsel)) {int prev_idx, idx_delta;
@@ -94,6 +99,13 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, } } +if (callback) { +int __ret =callback (hpp, false); + +advance_hpp (hpp, __ret); + ret += __ret; + } +/* * Restore original buf and size as it's where caller expects * the result will be saved.
@@ -169,7 +181,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, NULL, " %6.2f%%", \ hpp_color_scnprintf, true); \ }
@@ -178,7 +190,7 @@ 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, \ + return __hpp__fmt(hpp, he, he_get_##_field, NULL, fmt, \ hpp_entry_scnprintf, true); \ }
@@ -192,7 +204,7 @@ 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, \ + return __hpp__fmt(hpp, he, he_get_raw_##_field, NULL, fmt, \ hpp_entry_scnprintf, false); \ }
tools/perf/util/hist.h +3 -1
@@ -166,10 +166,12 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); +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, -u64 (*get_field)(struct hist_entry *), +hpp_field_fn get_field,hpp_callback_fn callback,const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc)
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf ui/tui: Reuse generic __hpp__fmt() code
perf ui/tui: Reuse generic __hpp__fmt() code
Commit-ID: 2f6d9009af1df0f7cba1fdfe012a089babd8c747 Gitweb: http://git.kernel.org/tip/2f6d9009af1df0f7cba1fdfe012a089babd8c747 Author: Namhyung Kim <[email protected]> AuthorDate: Mon, 3 Mar 2014 10:14:05 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Mar 2014 18:08:39 -0300
perf ui/tui: Reuse generic __hpp__fmt() code
The __hpp__color_fmt used in the TUI code can be replace by the generic code with small change in print_fn callback. And it also needs to move callback function to the generic __hpp__fmt().
No functional changes intended.
--- tools/perf/ui/browsers/hists.c | 122 ++++++++++++++--------------------------- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/ui/hist.c | 26 ++++++--- tools/perf/util/hist.h | 4 +- 4 files changed, 63 insertions(+), 91 deletions(-)
tools/perf/ui/browsers/hists.c +40 -82
@@ -587,95 +587,52 @@ struct hpp_arg {bool current_entry; }; -static int __hpp__color_callchain (struct hpp_arg *arg) +static int __hpp__overhead_callback (struct perf_hpp *hpp,bool front) { -if (!symbol_conf.use_callchain) -return 0 ; - -slsmg_printf ("%c " , arg->folded_sign); -return 2 ; -} - -static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), -int (*callchain_cb)(struct hpp_arg *)) -{ -int ret =0 ; -double percent =0.0 ; -struct hists *hists = he->hists;struct hpp_arg *arg = hpp->ptr; -if (hists->stats.total_period) - percent =100.0 *get_field (he) / hists->stats.total_period; - -ui_browser__set_percent_color (arg->b, percent, arg->current_entry); - -if (callchain_cb) - ret +=callchain_cb (arg); - - ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); -slsmg_printf ("%s" , hpp->buf); - -if (symbol_conf.event_group) { -int prev_idx, idx_delta; -struct perf_evsel *evsel =hists_to_evsel (hists); -struct hist_entry *pair; -int nr_members = evsel->nr_members; - -if (nr_members <=1 ) - goto out; +if (arg->current_entry && arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_SELECTED ); +else +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); - prev_idx =perf_evsel__group_idx (evsel); +if (front) { +if (!symbol_conf.use_callchain) +return 0 ; -list_for_each_entry (pair, &he->pairs.head, pairs.node) { -u64 period =get_field (pair); -u64 total = pair->hists->stats.total_period; +slsmg_printf ("%c " , arg->folded_sign); +return 2 ; + } -if (!total) -continue ; +return 0 ; +} - evsel =hists_to_evsel (pair->hists); - idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; +static int __hpp__color_callback (struct perf_hpp *hpp,bool front__maybe_unused ) +{ +struct hpp_arg *arg = hpp->ptr; -while (idx_delta--) { -/* -* zero-fill group members in the middle which -* have no sample -*/ -ui_browser__set_percent_color (arg->b,0.0 , - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" ,0.0 ); -slsmg_printf ("%s" , hpp->buf); - } +if (!arg->current_entry || !arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); +return 0 ; +} - percent =100.0 * period / total; -ui_browser__set_percent_color (arg->b, percent, - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" , percent); -slsmg_printf ("%s" , hpp->buf); +static int __hpp__slsmg_color_printf (struct perf_hpp *hpp,const char *fmt, ...) +{ +struct hpp_arg *arg = hpp->ptr; +int ret; +va_list args; +double percent; - prev_idx =perf_evsel__group_idx (evsel); - } +va_start (args, fmt); + percent =va_arg (args, double); +va_end (args); - idx_delta = nr_members - prev_idx -1 ; +ui_browser__set_percent_color (arg->b, percent, arg->current_entry); -while (idx_delta--) { -/* -* zero-fill group members at last which have no sample -*/ -ui_browser__set_percent_color (arg->b,0.0 , - arg->current_entry); - ret +=scnprintf (hpp->buf, hpp->size, -" %6.2f%%" ,0.0 ); -slsmg_printf ("%s" , hpp->buf); - } - } -out: -if (!arg->current_entry || !arg->b->navkeypressed) -ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); + ret =scnprintf (hpp->buf, hpp->size, fmt, percent); +slsmg_printf ("%s" , hpp->buf); +advance_hpp (hpp, ret);return ret; }
@@ -690,14 +647,15 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\struct perf_hpp *hpp, \ struct hist_entry *he) \ { \ - return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \ + return __hpp__fmt(hpp, he, __hpp_get_##_field, _cb, " %6.2f%%", \ +__hpp__slsmg_color_printf ,true ); \ } -__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__color_callchain) -__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, NULL) -__HPP_COLOR_PERCENT_FN(overhead_us, period_us, NULL) -__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, NULL) -__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, NULL) +__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__overhead_callback) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, __hpp__color_callback) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, __hpp__color_callback)#undef __HPP_COLOR_PERCENT_FN
tools/perf/ui/gtk/hists.c +1 -1
@@ -43,7 +43,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, NULL, " %6.2f%%", \__percent_color_snprintf ,true ); \ }
tools/perf/ui/hist.c +19 -7
@@ -16,15 +16,20 @@ })int __hpp__fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *), +hpp_field_fn get_field,hpp_callback_fn callback,const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent) { -int ret; +int ret =0 ;struct hists *hists = he->hists;struct perf_evsel *evsel =hists_to_evsel (hists);char *buf = hpp->buf;size_t size = hpp->size; +if (callback) { + ret =callback (hpp, true); +advance_hpp (hpp, ret); + } +if (fmt_percent) {double percent =0.0 ;
@@ -32,9 +37,9 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, percent =100.0 *get_field (he) / hists->stats.total_period; - ret =hpp__call_print_fn (hpp, print_fn, fmt, percent); + ret +=hpp__call_print_fn (hpp, print_fn, fmt, percent); }else - ret =hpp__call_print_fn (hpp, print_fn, fmt,get_field (he)); + ret +=hpp__call_print_fn (hpp, print_fn, fmt,get_field (he));if (perf_evsel__is_group_event (evsel)) {int prev_idx, idx_delta;
@@ -94,6 +99,13 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, } } +if (callback) { +int __ret =callback (hpp, false); + +advance_hpp (hpp, __ret); + ret += __ret; + } +/* * Restore original buf and size as it's where caller expects * the result will be saved.
@@ -169,7 +181,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, NULL, " %6.2f%%", \ hpp_color_scnprintf, true); \ }
@@ -178,7 +190,7 @@ 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, \ + return __hpp__fmt(hpp, he, he_get_##_field, NULL, fmt, \ hpp_entry_scnprintf, true); \ }
@@ -192,7 +204,7 @@ 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, \ + return __hpp__fmt(hpp, he, he_get_raw_##_field, NULL, fmt, \ hpp_entry_scnprintf, false); \ }
tools/perf/util/hist.h +3 -1
@@ -166,10 +166,12 @@ void perf_hpp__init(void);void perf_hpp__column_register (struct perf_hpp_fmt *format);void perf_hpp__column_enable (unsigned col); +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, -u64 (*get_field)(struct hist_entry *), +hpp_field_fn get_field,hpp_callback_fn callback,const char *fmt,hpp_snprint_fn print_fn,bool fmt_percent);static inline void advance_hpp (struct perf_hpp *hpp,int inc)
Namhyung Kim
maintainerPATCH 5/13 perf tools: Pass evsel to hpp->header/width functions explicitly
In reply to Namhyung KimThose functions need evsel to investigate event group and it's passed via hpp->ptr. However as it can be missed easily so it's better to pass it via an argument IMHO.
--- tools/perf/builtin-diff.c | 7 ++++--- tools/perf/ui/gtk/hists.c | 3 +-- tools/perf/ui/hist.c | 37 ++++++++++++++++--------------------- tools/perf/ui/stdio/hist.c | 5 ++--- tools/perf/util/hist.h | 6 ++++-- 5 files changed, 27 insertions(+), 31 deletions(-)
tools/perf/builtin-diff.c +4 -3
@@ -952,8 +952,8 @@ static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp, dfmt->header_width, buf); } -static int hpp__header (struct perf_hpp_fmt *fmt, -struct perf_hpp *hpp) +static int hpp__header (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct perf_evsel *evsel__maybe_unused ) {struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);
@@ -963,7 +963,8 @@ static int hpp__header(struct perf_hpp_fmt *fmt, }static int hpp__width (struct perf_hpp_fmt *fmt, -struct perf_hpp *hpp__maybe_unused ) +struct perf_hpp *hpp__maybe_unused , +struct perf_evsel *evsel__maybe_unused ) {struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);
tools/perf/ui/gtk/hists.c +1 -2
@@ -165,7 +165,6 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,struct perf_hpp hpp = { .buf = s, .size =sizeof (s), - .ptr =hists_to_evsel (hists), }; nr_cols =0 ;
@@ -192,7 +191,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, col_idx =0 ;perf_hpp__for_each_format (fmt) { - fmt->header (fmt, &hpp); + fmt->header (fmt, &hpp,hists_to_evsel (hists)); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -1, ltrim(s),
tools/perf/ui/hist.c +16 -21
@@ -116,31 +116,28 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,return ret; } -#define __HPP_HEADER_FN (_type, _str, _min_width, _unit_width) \ -static int hpp__header_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ - struct perf_hpp *hpp) \ -{ \ - int len = _min_width; \ - \ - if (symbol_conf.event_group) { \ - struct perf_evsel *evsel = hpp->ptr; \ - \ - len = max(len, evsel->nr_members * _unit_width); \ - } \ - return scnprintf(hpp->buf, hpp->size, "%*s", len, _str); \ +#define __HPP_HEADER_FN (_type, _str, _min_width, _unit_width) \ +static int hpp__header_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ + struct perf_hpp *hpp, struct perf_evsel *evsel) \ +{ \ + int len = _min_width; \ + \ + if (symbol_conf.event_group) \ + len = max(len, evsel->nr_members * _unit_width); \ + \ + return scnprintf(hpp->buf, hpp->size, "%*s", len, _str); \ }#define __HPP_WIDTH_FN (_type, _min_width, _unit_width) \ static int hpp__width_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ - struct perf_hpp *hpp __maybe_unused) \ + struct perf_hpp *hpp __maybe_unused, \ + struct perf_evsel *evsel) \ { \ int len = _min_width; \ \ - if (symbol_conf.event_group) { \ - struct perf_evsel *evsel = hpp->ptr; \ - \ + if (symbol_conf.event_group) \ len = max(len, evsel->nr_members * _unit_width); \ - } \ + \ return len; \ }
@@ -329,15 +326,13 @@ unsigned int hists__sort_list_width(struct hists *hists)struct perf_hpp_fmt *fmt;struct sort_entry *se;int i =0 , ret =0 ; -struct perf_hpp dummy_hpp = { - .ptr =hists_to_evsel (hists), - }; +struct perf_hpp dummy_hpp;perf_hpp__for_each_format (fmt) {if (i) ret +=2 ; - ret += fmt->width (fmt, &dummy_hpp); + ret += fmt->width (fmt, &dummy_hpp,hists_to_evsel (hists)); }list_for_each_entry (se, &hist_entry__sort_list, list)
tools/perf/ui/stdio/hist.c +2 -3
@@ -379,7 +379,6 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,struct perf_hpp dummy_hpp = { .buf = bf, .size =sizeof (bf), - .ptr =hists_to_evsel (hists), };bool first = true;size_t linesz;
@@ -398,7 +397,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,else first = false; - fmt->header (fmt, &dummy_hpp); + fmt->header (fmt, &dummy_hpp,hists_to_evsel (hists));fprintf (fp,"%s" , bf); }
@@ -443,7 +442,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,else first = false; - width = fmt->width (fmt, &dummy_hpp); + width = fmt->width (fmt, &dummy_hpp,hists_to_evsel (hists));for (i =0 ; i < width; i++)fprintf (fp,"." ); }
tools/perf/util/hist.h +4 -2
@@ -132,8 +132,10 @@ struct perf_hpp { };struct perf_hpp_fmt { -int (*header)(struct perf_hpp_fmt *fmt,struct perf_hpp *hpp); -int (*width)(struct perf_hpp_fmt *fmt,struct perf_hpp *hpp); +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, +struct perf_evsel *evsel);int (*color)(struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he); int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 6/13 perf tools: Count periods of filtered entries separately
In reply to Namhyung KimCurrently if a sample was filtered by command line option, it just dropped. But this affects final output in that the percentage can be different since the filtered entries were not included to the total.
But user might want to see the original percentages when filter applied so add new total_filtered_period filed to hists->stats in order to be controlled by user later. It doesn't change the current behavior yet.
--- tools/perf/builtin-report.c | 2 +- tools/perf/util/event.c | 22 ++++++++++------------ tools/perf/util/hist.c | 10 ++-------- tools/perf/util/hist.h | 10 ++++++++++ tools/perf/util/symbol.h | 2 +- 5 files changed, 24 insertions(+), 22 deletions(-)
tools/perf/builtin-report.c +1 -1
@@ -223,7 +223,7 @@ static int process_sample_event(struct perf_tool *tool,return -1 ; } -if (al.filtered || (rep->hide_unresolved && al.sym ==NULL )) +if (rep->hide_unresolved && al.sym ==NULL )return 0 ;if (rep->cpu_list && !test_bit (sample->cpu, rep->cpu_bitmap))
tools/perf/util/event.c +10 -12
@@ -3,6 +3,7 @@#include "debug.h" #include "machine.h" #include "sort.h" +#include "hist.h" #include "string.h" #include "strlist.h" #include "thread.h"
@@ -661,7 +662,7 @@ void thread__find_addr_map(struct thread *thread, al->thread = thread; al->addr = addr; al->cpumode = cpumode; - al->filtered = false; + al->filtered =0 ;if (machine ==NULL ) { al->map =NULL ;
@@ -687,11 +688,11 @@ void thread__find_addr_map(struct thread *thread,if ((cpumode ==PERF_RECORD_MISC_GUEST_USER || cpumode ==PERF_RECORD_MISC_GUEST_KERNEL ) && !perf_guest) - al->filtered = true; + al->filtered |= (1 <<HIST_FILTER__GUEST );if ((cpumode ==PERF_RECORD_MISC_USER || cpumode ==PERF_RECORD_MISC_KERNEL ) && !perf_host) - al->filtered = true; + al->filtered |= (1 <<HIST_FILTER__HOST );return ; }
@@ -748,9 +749,6 @@ int perf_event__preprocess_sample(const union perf_event *event,if (thread ==NULL )return -1 ; -if (thread__is_filtered (thread)) - goto out_filtered; -dump_printf (" ... thread: %s:%d\n" ,thread__comm_str (thread), thread->tid);/* * Have we already created the kernel maps for this machine?
@@ -765,6 +763,10 @@ int perf_event__preprocess_sample(const union perf_event *event,thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , sample->ip, al); + +if (thread__is_filtered (thread)) + al->filtered |= (1 <<HIST_FILTER__THREAD ); +dump_printf (" ...... dso: %s\n" , al->map ? al->map->dso->long_name : al->level =='H' ?"[hypervisor]" :"<not found>" );
@@ -780,7 +782,7 @@ int perf_event__preprocess_sample(const union perf_event *event, (dso->short_name != dso->long_name &&strlist__has_entry (symbol_conf.dso_list, dso->long_name))))) - goto out_filtered; + al->filtered |= (1 << HIST_FILTER__DSO); al->sym =map__find_symbol (al->map, al->addr, machine->symbol_filter);
@@ -789,11 +791,7 @@ int perf_event__preprocess_sample(const union perf_event *event,if (symbol_conf.sym_list && (!al->sym || !strlist__has_entry (symbol_conf.sym_list, al->sym->name))) - goto out_filtered; - -return 0 ; + al->filtered |= (1 <<HIST_FILTER__SYMBOL ); -out_filtered: - al->filtered = true;return 0 ; }
tools/perf/util/hist.c +2 -8
@@ -13,13 +13,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists,static bool hists__filter_entry_by_symbol (struct hists *hists,struct hist_entry *he); -enum hist_filter { -HIST_FILTER__DSO , -HIST_FILTER__THREAD , -HIST_FILTER__PARENT , -HIST_FILTER__SYMBOL , -}; -struct callchain_param callchain_param = { .mode =CHAIN_GRAPH_REL , .min_percent =0.5 ,
@@ -330,6 +323,7 @@ void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h)hists__calc_col_len (hists, h); ++hists->nr_entries; hists->stats.total_period += h->stat.period; + hists->stats.total_filtered_period += h->stat.period; } }
@@ -429,7 +423,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists, .weight = weight, }, .parent = sym_parent, - .filtered = symbol__parent_filter(sym_parent), + .filtered = symbol__parent_filter(sym_parent) | al->filtered, .hists = hists, .branch_info = bi, .mem_info = mi,
tools/perf/util/hist.h +10 -0
@@ -14,6 +14,15 @@ struct hist_entry;struct addr_location ;struct symbol ; +enum hist_filter { +HIST_FILTER__DSO , +HIST_FILTER__THREAD , +HIST_FILTER__PARENT , +HIST_FILTER__SYMBOL , +HIST_FILTER__GUEST , +HIST_FILTER__HOST , +}; +/* * The kernel collects the number of events it couldn't send in a stretch and * when possible sends this number in a PERF_RECORD_LOST event. The number of
@@ -28,6 +37,7 @@ struct symbol;*/ struct events_stats {u64 total_period; +u64 total_filtered_period;u64 total_lost;u64 total_invalid_chains;u32 nr_events[PERF_RECORD_HEADER_MAX ];
tools/perf/util/symbol.h +1 -1
@@ -186,7 +186,7 @@ struct addr_location {struct symbol *sym;u64 addr;char level; -bool filtered; +u8 filtered;u8 cpumode;s32 cpu; };
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 7/13 perf hists: Add support for showing relative percentage
In reply to Namhyung KimWhen filtering by thread, dso or symbol on TUI it also update total period so that the output shows different result than no filter - the percentage changed to relative to filtered entries only. Sometimes this is not desired since users might expect same results with filter.
So new filtered_* fields to hists->stats to count them separately. They'll be controlled/used by user later.
--- tools/perf/builtin-report.c | 6 ++++++ tools/perf/util/hist.c | 19 +++++++++++++++---- tools/perf/util/hist.h | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-)
tools/perf/builtin-report.c +6 -0
@@ -121,6 +121,8 @@ static int report__add_mem_hist_entry(struct report *rep, struct addr_location * evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++; err =hist_entry__append_callchain (he, sample); out:return err;
@@ -170,6 +172,8 @@ static int report__add_branch_hist_entry(struct report *rep, struct addr_locatio evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++; }else goto out; }
@@ -201,6 +205,8 @@ static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel, err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); evsel->hists.stats.total_period += sample->period; +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:return err;
tools/perf/util/hist.c +15 -4
@@ -675,8 +675,8 @@ void hists__output_resort(struct hists *hists) next =rb_first (root); hists->entries =RB_ROOT ; - hists->nr_entries =0 ; - hists->stats.total_period =0 ; + hists->nr_entries = hists->nr_filtered_entries =0 ; + hists->stats.total_period = hists->stats.total_filtered_period =0 ;hists__reset_col_len (hists);while (next) {
@@ -695,12 +695,17 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *hif (h->filtered)return ; - ++hists->nr_entries; -if (h->ms.unfolded) + hists->nr_entries++; + hists->nr_filtered_entries++; +if (h->ms.unfolded) { hists->nr_entries += h->nr_rows; + hists->nr_filtered_entries += h->nr_rows; + } h->row_offset =0 ; hists->stats.total_period += h->stat.period; + hists->stats.total_filtered_period += h->stat.period; hists->stats.nr_events[PERF_RECORD_SAMPLE ] += h->stat.nr_events; + hists->stats.nr_filtered_samples += h->stat.nr_events;hists__calc_col_len (hists, h); }
@@ -723,7 +728,9 @@ void hists__filter_by_dso(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {
@@ -756,7 +763,9 @@ void hists__filter_by_thread(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {
@@ -787,7 +796,9 @@ void hists__filter_by_symbol(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {
tools/perf/util/hist.h +2 -0
@@ -41,6 +41,7 @@ struct events_stats {u64 total_lost;u64 total_invalid_chains;u32 nr_events[PERF_RECORD_HEADER_MAX ]; +u32 nr_filtered_samples;u32 nr_lost_warned;u32 nr_unknown_events;u32 nr_invalid_chains;
@@ -84,6 +85,7 @@ struct hists {struct rb_root entries;struct rb_root entries_collapsed;u64 nr_entries; +u64 nr_filtered_entries;const struct thread *thread_filter;const struct dso *dso_filter;const char *uid_filter_str;
Signature · 1 line
1.7.11.7
Re: [PATCH 07/13] perf hists: Add support for showing relative percentage
Em Mon, Mar 03, 2014 at 10:14:08AM +0900, Namhyung Kim escreveu:
Quoted 21 lines
When filtering by thread, dso or symbol on TUI it also update total period so that the output shows different result than no filter - the percentage changed to relative to filtered entries only. Sometimes this is not desired since users might expect same results with filter.
So new filtered_* fields to
hists->statsto count them separately. They'll be controlled/used by user later.Acked-by Jiri Olsa <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/builtin-report.c | 6 ++++++ tools/perf/util/hist.c | 19 +++++++++++++++---- tools/perf/util/hist.h | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-)tools/perf/builtin-report.c +0
-0
tools/perf/builtin-report.c static int report__add_mem_hist_entry(struct report *rep, struct addr_location * · line 125
Quoted 5 lines
tools/perf/builtin-report.c +2
-0@@ -121,6 +121,8 @@ static int report__add_mem_hist_entry(struct report *rep, struct addr_location * evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++;
Huh? I read the above as "if not filtered, increment the number of filtered samples", isn't this reversed?
I.e. I understand "filtered" as entries that the filter applied to, so will not be considered, and you use this meaning for he->filtered, but not for stats_nr_filtered_samples, right?
- Arnaldo
Quoted 108 lines
tools/perf/builtin-report.c +4
-0err =hist_entry__append_callchain (he, sample); out:return err;@@ -170,6 +172,8 @@ static int report__add_branch_hist_entry(struct report *rep, struct addr_locatio evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++; }else goto out; }@@ -201,6 +205,8 @@ static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel, err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); evsel->hists.stats.total_period += sample->period; +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:return err;tools/perf/util/hist.c +15
-4@@ -675,8 +675,8 @@ void hists__output_resort(struct hists *hists) next =rb_first (root); hists->entries =RB_ROOT ; - hists->nr_entries =0 ; - hists->stats.total_period =0 ; + hists->nr_entries = hists->nr_filtered_entries =0 ; + hists->stats.total_period = hists->stats.total_filtered_period =0 ;hists__reset_col_len (hists);while (next) {@@ -695,12 +695,17 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *hif (h->filtered)return ; - ++hists->nr_entries; -if (h->ms.unfolded) + hists->nr_entries++; + hists->nr_filtered_entries++; +if (h->ms.unfolded) { hists->nr_entries += h->nr_rows; + hists->nr_filtered_entries += h->nr_rows; + } h->row_offset =0 ; hists->stats.total_period += h->stat.period; + hists->stats.total_filtered_period += h->stat.period; hists->stats.nr_events[PERF_RECORD_SAMPLE ] += h->stat.nr_events; + hists->stats.nr_filtered_samples += h->stat.nr_events;hists__calc_col_len (hists, h); }@@ -723,7 +728,9 @@ void hists__filter_by_dso(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {@@ -756,7 +763,9 @@ void hists__filter_by_thread(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {@@ -787,7 +796,9 @@ void hists__filter_by_symbol(struct hists *hists)struct rb_node *nd; hists->nr_entries = hists->stats.total_period =0 ; + hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; + hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) {tools/perf/util/hist.h +2
-0@@ -41,6 +41,7 @@ struct events_stats {u64 total_lost;u64 total_invalid_chains;u32 nr_events[PERF_RECORD_HEADER_MAX ]; +u32 nr_filtered_samples;u32 nr_lost_warned;u32 nr_unknown_events;u32 nr_invalid_chains;@@ -84,6 +85,7 @@ struct hists {struct rb_root entries;struct rb_root entries_collapsed;u64 nr_entries; +u64 nr_filtered_entries;const struct thread *thread_filter;const struct dso *dso_filter;const char *uid_filter_str;Signature · 1 line
1.7.11.7
PVT Re: [PATCH 07/13] perf hists: Add support for showing relative percentage
Em Fri, Mar 07, 2014 at 11:37:07AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 32 lines
Em Mon, Mar 03, 2014 at 10:14:08AM +0900, Namhyung Kim escreveu:
Quoted 21 lines
When filtering by thread, dso or symbol on TUI it also update total period so that the output shows different result than no filter - the percentage changed to relative to filtered entries only. Sometimes this is not desired since users might expect same results with filter.
So new filtered_* fields to
hists->statsto count them separately. They'll be controlled/used by user later.Acked-by Jiri Olsa <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/builtin-report.c | 6 ++++++ tools/perf/util/hist.c | 19 +++++++++++++++---- tools/perf/util/hist.h | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-)tools/perf/builtin-report.c +0
-0tools/perf/builtin-report.c static int report__add_mem_hist_entry(struct report *rep, struct addr_location * · line 125
Quoted 5 lines
tools/perf/builtin-report.c +2
-0@@ -121,6 +121,8 @@ static int report__add_mem_hist_entry(struct report *rep, struct addr_location * evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); +if (!he->filtered) + evsel->hists.stats.nr_filtered_samples++;Huh? I read the above as "if not filtered, increment the number of filtered samples", isn't this reversed?
Quoted 3 lines
I.e. I understand "filtered" as entries that the filter applied to, so will not be considered, and you use this meaning for
he->filtered, but not forstats_nr_filtered_samples, right?
Since I had to stop here, could you try reworking that other patch to avoid aligning the \ at the end of the line and renaming the above to some other name that makes he->filtered match in meaning what stats_nr_filtered_samples means?
Perhaps stats_nr_non_filtered_samples?
Quoted 1 line
- Arnaldo
Namhyung Kim
maintainerPATCH 8/13 perf report: Add --percentage option
In reply to Namhyung KimThe --percentage option is for controlling overhead percentage displayed. It can only receive either of "relative" or "absolute".
"relative" means it's relative to filtered entries only so that the sum of shown entries will be always 100%. "absolute" means it retains the original value before and after the filter is applied.
$ perf report -s comm
# Overhead Command
# ........ ............
#
74.19% cc1
7.61% gcc
6.11% as
4.35% sh
4.14% make
1.13% fixdep
... $ perf report -s comm -c cc1,gcc --percentage absolute
# Overhead Command
# ........ ............
#
74.19% cc1
7.61% gcc $ perf report -s comm -c cc1,gcc --percentage relative
# Overhead Command
# ........ ............
#
90.69% cc1
9.31% gccNote that it has zero effect if no filter was applied.
--- tools/perf/Documentation/perf-report.txt | 24 ++++++++++++++++------ tools/perf/builtin-report.c | 30 +++++++++++++++++++++++++-- tools/perf/ui/browsers/hists.c | 35 ++++++++++++++++++++++++-------- tools/perf/ui/gtk/hists.c | 11 +++++----- tools/perf/ui/hist.c | 8 ++++---- tools/perf/util/hist.c | 29 ++++++++++++-------------- tools/perf/util/hist.h | 1 + tools/perf/util/symbol.c | 1 + tools/perf/util/symbol.h | 3 ++- 9 files changed, 99 insertions(+), 43 deletions(-)
tools/perf/Documentation/perf-report.txt +18 -6
@@ -25,10 +25,6 @@ OPTIONS --verbose:: Be more verbose. (show symbol address, etc) --d:: ---dsos=:: - Only consider symbols in these dsos. CSV that understands - file://filename entries. -n:: --show-nr-samples:: Show the number of samples for each symbol
@@ -42,11 +38,18 @@ OPTIONS -c:: --comms=:: Only consider symbols in these comms. CSV that understands - file://filename entries. + file://filename entries. This option will affect the percentage of + the overhead column. See --percentage for more info. +-d:: +--dsos=:: + Only consider symbols in these dsos. CSV that understands + file://filename entries. This option will affect the percentage of + the overhead column. See --percentage for more info. -S:: --symbols=:: Only consider these symbols. CSV that understands - file://filename entries. + file://filename entries. This option will affect the percentage of + the overhead column. See --percentage for more info. --symbol-filter=:: Only show symbols that match (partially) with this filter.
@@ -237,6 +240,15 @@ OPTIONS Do not show entries which have an overhead under that percent. (Default: 0). +--percentage:: + Determine how to display the overhead percentage of filtered entries. + Filters can be applied by --comms, --dsos and/or --symbols options and + Zoom operations on the TUI (thread, dso, etc). + + "relative" means it's relative to filtered entries only so that the + sum of shown entries will be always 100%. "absolute" means it retains + the original value before and after the filter is applied. + --header:: Show header information in the perf.data file. This includes various information like hostname, OS and perf version, cpu/mem
tools/perf/builtin-report.c +28 -2
@@ -335,6 +335,11 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportchar buf[512 ];size_t size =sizeof (buf); +if (symbol_conf.filter_relative) { + nr_samples = hists->stats.nr_filtered_samples; + nr_events = hists->stats.total_filtered_period; + } +if (perf_evsel__is_group_event (evsel)) {struct perf_evsel *pos;
@@ -342,8 +347,13 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report evname = buf;for_each_group_member (pos, evsel) { - nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; - nr_events += pos->hists.stats.total_period; +if (symbol_conf.filter_relative) { + nr_samples += pos->hists.stats.nr_filtered_samples; + nr_events += pos->hists.stats.total_filtered_period; + }else { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } } }
@@ -699,6 +709,20 @@ parse_percent_limit(const struct option *opt, const char *str,return 0 ; } +static int +parse_percentage (const struct option *opt__maybe_unused ,const char *str, +int unset__maybe_unused ) +{ +if (!strcmp (str,"relative" )) + symbol_conf.filter_relative = true; +else if (!strcmp (str,"absolute" )) + symbol_conf.filter_relative = false; +else +return -1 ; + +return 0 ; +} +int cmd_report (int argc,const char **argv,const char *prefix__maybe_unused ) {struct perf_session *session;
@@ -821,6 +845,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)OPT_BOOLEAN (0 ,"mem-mode" , &report.mem_mode,"mem access profile" ),OPT_CALLBACK (0 ,"percent-limit" , &report,"percent" ,"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_percentage),OPT_END () }; struct perf_data_file file = {
tools/perf/ui/browsers/hists.c +27 -8
@@ -769,12 +769,15 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)for (nd = browser->top; nd; nd =rb_next (nd)) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); -float percent = h->stat.period *100.0 / - hb->hists->stats.total_period; +u64 total =hists__total_period (h->hists); +float percent =0.0 ;if (h->filtered)continue ; +if (total) + percent = h->stat.period *100.0 / total; +if (percent < hb->min_pcnt)continue ;
@@ -792,8 +795,11 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd, {while (nd !=NULL ) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); -float percent = h->stat.period *100.0 / - hists->stats.total_period; +u64 total =hists__total_period (hists); +float percent =0.0 ; + +if (total) + percent = h->stat.period *100.0 / total;if (percent < min_pcnt)return NULL ;
@@ -813,8 +819,11 @@ static struct rb_node *hists__filter_prev_entries(struct rb_node *nd, {while (nd !=NULL ) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); -float percent = h->stat.period *100.0 / - hists->stats.total_period; +u64 total =hists__total_period (hists); +float percent =0.0 ; + +if (total) + percent = h->stat.period *100.0 / total;if (!h->filtered && percent >= min_pcnt)return nd;
@@ -1189,6 +1198,11 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,char buf[512 ];size_t buflen =sizeof (buf); +if (symbol_conf.filter_relative) { + nr_samples = hists->stats.nr_filtered_samples; + nr_events = hists->stats.total_filtered_period; + } +if (perf_evsel__is_group_event (evsel)) {struct perf_evsel *pos;
@@ -1196,8 +1210,13 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size, ev_name = buf;for_each_group_member (pos, evsel) { - nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; - nr_events += pos->hists.stats.total_period; +if (symbol_conf.filter_relative) { + nr_samples += pos->hists.stats.nr_filtered_samples; + nr_events += pos->hists.stats.total_filtered_period; + }else { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } } }
tools/perf/ui/gtk/hists.c +5 -6
@@ -228,12 +228,15 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);GtkTreeIter iter; -float percent = h->stat.period *100.0 / - hists->stats.total_period; +u64 total =hists__total_period (h->hists); +float percent =0.0 ;if (h->filtered)continue ; +if (total) + percent = h->stat.period *100.0 / total; +if (percent < min_pcnt)continue ;
@@ -261,12 +264,8 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, }if (symbol_conf.use_callchain && sort__has_sym) { -u64 total; -if (callchain_param.mode ==CHAIN_GRAPH_REL ) total = h->stat.period; -else - total = hists->stats.total_period;perf_gtk__add_callchain (&h->sorted_chain, store, &iter, sym_col, total);
tools/perf/ui/hist.c +4 -4
@@ -32,10 +32,10 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,if (fmt_percent) {double percent =0.0 ; +u64 total =hists__total_period (hists); -if (hists->stats.total_period) - percent =100.0 *get_field (he) / - hists->stats.total_period; +if (total) + percent =100.0 *get_field (he) / total; ret +=hpp__call_print_fn (hpp, print_fn, fmt, percent); }else
@@ -50,7 +50,7 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,list_for_each_entry (pair, &he->pairs.head, pairs.node) {u64 period =get_field (pair); -u64 total = pair->hists->stats.total_period; +u64 total =hists__total_period (pair->hists);if (!total)continue ;
tools/perf/util/hist.c +13 -16
@@ -321,10 +321,11 @@ void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h) {if (!h->filtered) {hists__calc_col_len (hists, h); - ++hists->nr_entries; - hists->stats.total_period += h->stat.period; + hists->nr_filtered_entries++; hists->stats.total_filtered_period += h->stat.period; } + hists->nr_entries++; + hists->stats.total_period += h->stat.period; }static u8 symbol__parent_filter (const struct symbol *parent)
@@ -675,8 +676,9 @@ void hists__output_resort(struct hists *hists) next =rb_first (root); hists->entries =RB_ROOT ; - hists->nr_entries = hists->nr_filtered_entries =0 ; - hists->stats.total_period = hists->stats.total_filtered_period =0 ; + hists->nr_filtered_entries =0 ; + hists->stats.total_period =0 ; + hists->stats.total_filtered_period =0 ;hists__reset_col_len (hists);while (next) {
@@ -695,16 +697,11 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *hif (h->filtered)return ; - hists->nr_entries++; hists->nr_filtered_entries++; -if (h->ms.unfolded) { - hists->nr_entries += h->nr_rows; +if (h->ms.unfolded) hists->nr_filtered_entries += h->nr_rows; - } h->row_offset =0 ; - hists->stats.total_period += h->stat.period; hists->stats.total_filtered_period += h->stat.period; - hists->stats.nr_events[PERF_RECORD_SAMPLE ] += h->stat.nr_events; hists->stats.nr_filtered_samples += h->stat.nr_events;hists__calc_col_len (hists, h);
@@ -727,9 +724,7 @@ void hists__filter_by_dso(struct hists *hists) {struct rb_node *nd; - hists->nr_entries = hists->stats.total_period =0 ; hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; - hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);
@@ -762,9 +757,7 @@ void hists__filter_by_thread(struct hists *hists) {struct rb_node *nd; - hists->nr_entries = hists->stats.total_period =0 ; hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; - hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);
@@ -795,9 +788,7 @@ void hists__filter_by_symbol(struct hists *hists) {struct rb_node *nd; - hists->nr_entries = hists->stats.total_period =0 ; hists->nr_filtered_entries = hists->stats.total_filtered_period =0 ; - hists->stats.nr_events[PERF_RECORD_SAMPLE ] =0 ; hists->stats.nr_filtered_samples =0 ;hists__reset_col_len (hists);
@@ -943,3 +934,9 @@ int hists__link(struct hists *leader, struct hists *other)return 0 ; } + +u64 hists__total_period (struct hists *hists) +{ +return symbol_conf.filter_relative ? hists->stats.total_filtered_period : + hists->stats.total_period; +}
tools/perf/util/hist.h +1 -0
@@ -115,6 +115,7 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog);void hists__decay_entries (struct hists *hists,bool zap_user,bool zap_kernel);void hists__output_recalc_col_len (struct hists *hists,int max_rows); +u64 hists__total_period (struct hists *hists);void hists__inc_nr_entries (struct hists *hists,struct hist_entry *h);void hists__inc_nr_events (struct hists *hists,u32 type);void events_stats__inc (struct events_stats *stats,u32 type);
tools/perf/util/symbol.c +1 -0
@@ -33,6 +33,7 @@ struct symbol_conf symbol_conf = { .try_vmlinux_path = true, .annotate_src = true, .demangle = true, + .filter_relative = true, .symfs = "", };
tools/perf/util/symbol.h +2 -1
@@ -115,7 +115,8 @@ struct symbol_conf { annotate_asm_raw, annotate_src, event_group, - demangle; + demangle, + filter_relative;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 9/13 perf top: Add --percentage option
In reply to Namhyung KimThe --percentage option is for controlling overhead percentage displayed. It can only receive either of "relative" or "absolute". Move the parser callback function into a common location since it's used by multiple commands now.
For more information, please see previous commit same thing done to "perf report".
--- tools/perf/Documentation/perf-top.txt | 18 +++++++++++++++--- tools/perf/builtin-report.c | 16 +--------------- tools/perf/builtin-top.c | 2 ++ tools/perf/util/hist.c | 13 +++++++++++++ tools/perf/util/hist.h | 5 +++++ 5 files changed, 36 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-top.txt +15 -3
@@ -124,13 +124,16 @@ Default is to monitor all CPUS. Show a column with the sum of periods. --dsos:: - Only consider symbols in these dsos. + Only consider symbols in these dsos. This option will affect the + percentage of the overhead column. See --percentage for more info. --comms:: - Only consider symbols in these comms. + Only consider symbols in these comms. This option will affect the + percentage of the overhead column. See --percentage for more info. --symbols:: - Only consider these symbols. + Only consider these symbols. This option will affect the + percentage of the overhead column. See --percentage for more info. -M:: --disassembler-style=:: Set disassembler style for objdump.
@@ -166,6 +169,15 @@ Default is to monitor all CPUS. Do not show entries which have an overhead under that percent. (Default: 0). +--percentage:: + Determine how to display the overhead percentage of filtered entries. + Filters can be applied by --comms, --dsos and/or --symbols options and + Zoom operations on the TUI (thread, dso, etc). + + "relative" means it's relative to filtered entries only so that the + sum of shown entries will be always 100%. "absolute" means it retains + the original value before and after the filter is applied. + INTERACTIVE PROMPTING KEYS --------------------------
tools/perf/builtin-report.c +1 -15
@@ -709,20 +709,6 @@ parse_percent_limit(const struct option *opt, const char *str,return 0 ; } -static int -parse_percentage (const struct option *opt__maybe_unused ,const char *str, -int unset__maybe_unused ) -{ -if (!strcmp (str,"relative" )) - symbol_conf.filter_relative = true; -else if (!strcmp (str,"absolute" )) - symbol_conf.filter_relative = false; -else -return -1 ; - -return 0 ; -} -int cmd_report (int argc,const char **argv,const char *prefix__maybe_unused ) {struct perf_session *session;
@@ -846,7 +832,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)OPT_CALLBACK (0 ,"percent-limit" , &report,"percent" ,"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_percentage), +"how to display percentage of filtered entries" , parse_filter_percentage),OPT_END () }; struct perf_data_file file = {
tools/perf/builtin-top.c +2 -0
@@ -1114,6 +1114,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)OPT_STRING ('u' ,"uid" , &target->uid_str,"user" ,"user to profile" ),OPT_CALLBACK (0 ,"percent-limit" , &top,"percent" ,"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_END () }; const char * const top_usage[] = {
tools/perf/util/hist.c +13 -0
@@ -940,3 +940,16 @@ u64 hists__total_period(struct hists *hists)return symbol_conf.filter_relative ? hists->stats.total_filtered_period : hists->stats.total_period; } + +int parse_filter_percentage (const struct option *opt__maybe_unused , +const char *arg,int unset__maybe_unused ) +{ +if (!strcmp (arg,"relative" )) + symbol_conf.filter_relative = true; +else if (!strcmp (arg,"absolute" )) + symbol_conf.filter_relative = false; +else +return -1 ; + +return 0 ; +}
tools/perf/util/hist.h +5 -0
@@ -254,4 +254,9 @@ static inline int script_browse(const char *script_opt __maybe_unused)#endif unsigned int hists__sort_list_width (struct hists *hists); + +struct option ; +int parse_filter_percentage (const struct option *opt__maybe_unused , +const char *arg,int unset__maybe_unused ); +#endif /* __PERF_HIST_H */
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 10/13 perf diff: Add --percentage option
In reply to Namhyung KimThe --percentage option is for controlling overhead percentage displayed. It can only receive either of "relative" or "absolute" and affects -c delta output only.
For more information, please see previous commit same thing done to "perf report".
--- tools/perf/Documentation/perf-diff.txt | 21 ++++++++++++++++++--- tools/perf/builtin-diff.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 9 deletions(-)
tools/perf/Documentation/perf-diff.txt +18 -3
@@ -33,17 +33,20 @@ OPTIONS -d:: --dsos=:: Only consider symbols in these dsos. CSV that understands - file://filename entries. + file://filename entries. This option will affect the percentage + of the Baseline/Delta column. See --percentage for more info. -C:: --comms=:: Only consider symbols in these comms. CSV that understands - file://filename entries. + file://filename entries. This option will affect the percentage + of the Baseline/Delta column. See --percentage for more info. -S:: --symbols=:: Only consider these symbols. CSV that understands - file://filename entries. + file://filename entries. This option will affect the percentage + of the Baseline/Delta column. See --percentage for more info. -s:: --sort=::
@@ -89,6 +92,14 @@ OPTIONS --order:: Specify compute sorting column number. +--percentage:: + Determine how to display the overhead percentage of filtered entries. + Filters can be applied by --comms, --dsos and/or --symbols options. + + "relative" means it's relative to filtered entries only so that the + sum of shown entries will be always 100%. "absolute" means it retains + the original value before and after the filter is applied. + COMPARISON ---------- The comparison is governed by the baseline file. The baseline perf.data
@@ -157,6 +168,10 @@ with: - period_percent being the % of the hist entry period value within single data file + - with filtering by -C, -d and/or -S, period_percent might be changed + relative to how entries are filtered. Use --percentage=absolute to + prevent such fluctuation. + ratio ~~~~~ If specified the 'Ratio' column is displayed with value 'r' computed as:
tools/perf/builtin-diff.c +27 -6
@@ -221,6 +221,10 @@ static int setup_compute(const struct option *opt, const char *str,static double period_percent (struct hist_entry *he,u64 period) {u64 total = he->hists->stats.total_period; + +if (symbol_conf.filter_relative) + total = he->hists->stats.total_filtered_period; +return (period *100.0 ) / total; }
@@ -259,11 +263,18 @@ static s64 compute_wdiff(struct hist_entry *he, struct hist_entry *pair)static int formula_delta (struct hist_entry *he,struct hist_entry *pair,char *buf,size_t size) { +u64 he_total = he->hists->stats.total_period; +u64 pair_total = pair->hists->stats.total_period; + +if (symbol_conf.filter_relative) { + he_total = he->hists->stats.total_filtered_period; + pair_total = pair->hists->stats.total_filtered_period; + }return scnprintf (buf, size,"(%" PRIu64" * 100 / %" PRIu64") - " "(%" PRIu64" * 100 / %" PRIu64")" , - pair->stat.period, pair->hists->stats.total_period, - he->stat.period, he->hists->stats.total_period); + pair->stat.period, pair_total, + he->stat.period, he_total); } static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
@@ -327,15 +338,16 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,return -1 ; } -if (al.filtered) -return 0 ; -if (hists__add_entry (&evsel->hists, &al, sample->period, sample->weight, sample->transaction)) {pr_warning ("problem incrementing symbol period, skipping event\n" );return -1 ; } +if (al.filtered ==0 ) { + evsel->hists.stats.total_filtered_period += sample->period; + evsel->hists.nr_filtered_entries++; + } evsel->hists.stats.total_period += sample->period;return 0 ; }
@@ -565,7 +577,9 @@ static void hists__compute_resort(struct hists *hists) next =rb_first (root); hists->nr_entries =0 ; + hists->nr_filtered_entries =0 ; hists->stats.total_period =0 ; + hists->stats.total_filtered_period =0 ;hists__reset_col_len (hists);while (next !=NULL ) {
@@ -732,13 +746,20 @@ static const struct option options[] = {OPT_STRING (0 ,"symfs" , &symbol_conf.symfs,"directory" ,"Look for files with symbols relative to this directory" ),OPT_UINTEGER ('o' ,"order" , &sort_compute,"Specify compute sorting." ), +OPT_CALLBACK (0 ,"percentage" ,NULL ,"relative|absolute" , +"How to display percentage of filtered entries" , parse_filter_percentage),OPT_END () };static double baseline_percent (struct hist_entry *he) {struct hists *hists = he->hists; -return 100.0 * he->stat.period / hists->stats.total_period; +u64 total = hists->stats.total_period; + +if (symbol_conf.filter_relative) + total = hists->stats.total_filtered_period; + +return 100.0 * he->stat.period / total; } static int hpp__color_baseline(struct perf_hpp_fmt *fmt,
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 11/13 perf tools: Add hist.percentage config option
In reply to Namhyung KimAdd hist.percentage option for setting default value of the symbol_conf.filter_relative. It affects the output of various perf commands (like perf report, top and diff) only if filter(s) applied.
An user can write .perfconfig file like below to show absolute percentage of filtered entries by default:
$ cat ~/.perfconfig [hist] percentage = absolute
And it can be changed through command line:
$ perf report --percentage relative
--- tools/perf/builtin-diff.c | 2 ++ tools/perf/util/config.c | 4 ++++ tools/perf/util/hist.c | 8 ++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 15 insertions(+)
tools/perf/builtin-diff.c +2 -0
@@ -1141,6 +1141,8 @@ static int data_init(int argc, const char **argv)int cmd_diff (int argc,const char **argv,const char *prefix__maybe_unused ) { +perf_config (perf_default_config,NULL ); + sort_order = diff__default_sort_order; argc =parse_options (argc, argv, options, diff_usage,0 );
tools/perf/util/config.c +4 -0
@@ -11,6 +11,7 @@#include "util.h" #include "cache.h" #include "exec_cmd.h" +#include "util/hist.h" /* perf_hist_config */ #define MAXNAME (256)
@@ -355,6 +356,9 @@ int perf_default_config(const char *var, const char *value,if (!prefixcmp (var,"core." ))return perf_default_core_config (var, value); +if (!prefixcmp (var,"hist." )) +return perf_hist_config (var, value); +/* Add other config variables here. */ return 0 ; }
tools/perf/util/hist.c +8 -0
@@ -953,3 +953,11 @@ int parse_filter_percentage(const struct option *opt __maybe_unused,return 0 ; } + +int perf_hist_config (const char *var,const char *value) +{ +if (!strcmp (var,"hist.percentage" )) +return parse_filter_percentage (NULL , value,0 ); + +return 0 ; +}
tools/perf/util/hist.h +1 -0
@@ -258,5 +258,6 @@ unsigned int hists__sort_list_width(struct hists *hists);struct option ;int parse_filter_percentage (const struct option *opt__maybe_unused ,const char *arg,int unset__maybe_unused ); +int perf_hist_config (const char *var,const char *value);#endif /* __PERF_HIST_H */
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 12/13 perf ui/tui: Add 'F' hotkey to toggle percentage output
In reply to Namhyung KimAdd 'F' hotkey to toggle relative and absolute percentage of filtered entries.
--- tools/perf/ui/browsers/hists.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/ui/browsers/hists.c +4 -0
@@ -1389,6 +1389,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,"C Collapse all callchains\n" \"d Zoom into current DSO\n" \"E Expand all callchains\n" \ +"F Toggle percentage of filtered entries\n" \/* help messages are sorted by lexical order of the hotkey */ const char report_help[] = HIST_BROWSER_HELP_COMMON
@@ -1494,6 +1495,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (env->arch)tui__header_window (env);continue ; +case 'F' : + symbol_conf.filter_relative ^=1 ; +continue ;case K_F1 :case 'h' :case '?' :
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 13/13 perf tools: Show absolute percentage by default
In reply to Namhyung KimNow perf report will show absolute percentage on filter entries by default.
--- tools/perf/util/symbol.c | 1 - 1 file changed, 1 deletion(-)
tools/perf/util/symbol.c +0 -1
@@ -33,7 +33,6 @@ struct symbol_conf symbol_conf = { .try_vmlinux_path = true, .annotate_src = true, .demangle = true, - .filter_relative = true, .symfs = "", };
Signature · 1 line
1.7.11.7