perf/core callchains improvements and fixes
Arnaldo Carvalho de Melo
maintainerSee http://www.infradead.org/rpr.html
Hi Ingo,
Please consider pulling, this is on top of two previous pull requests I
made,
Thanks,
- Arnaldo
The following changes since commit 814568db641f6587c1e98a3a85f214cb6a30fe10:
perf build: Align the names of the build tests: (2016-01-29 17:51:04 -0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-3
for you to fetch changes up to 3848c23b19e07188bfa15e3d9a2ac27692f2ff3c:
perf report: Don't show blank lines if entry has no callchain (2016-02-01 17:51:09 -0300)
----------------------------------------------------------------
perf/core callchain fixes and improvements
User visible:
- Make --percent-limit apply to callchains also and fix some bugs related to --percent-limit (Namhyung Kim)
----------------------------------------------------------------
Namhyung Kim (10):
perf hists: Fix min callchain hits calculation
perf hists: Update hists' total period when adding entries perf report: Apply --percent-limit to callchains also perf report: Get rid of hist_entry__callchain_fprintf() perf callchain: Pass parent_samples to __callchain__fprintf_graph() perf report: Fix percent display in callchains on --stdio perf hists browser: Fix dump to show correct callchain style perf hists browser: Pass parent_total to callchain print functions perf hists browser: Fix percent display in callchains perf report: Don't show blank lines if entry has no callchain
tools/perf/builtin-report.c | 9 +++- tools/perf/ui/browsers/hists.c | 113 +++++++++++++++++++++++++---------------- tools/perf/ui/stdio/hist.c | 77 ++++++++++++++-------------- tools/perf/util/hist.c | 24 +++++++-- 4 files changed, 136 insertions(+), 87 deletions(-)
Arnaldo Carvalho de Melo
maintainerPATCH 1/10 perf hists: Fix min callchain hits calculation
See http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
The total period should be get using hists__total_period() since it takes filtered entries into account. In addition, if callchain mode is 'fractal', the total period should be the entry's period.
--- tools/perf/util/hist.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +11 -2
@@ -1163,9 +1163,18 @@ static void __hists__insert_output_entry(struct rb_root *entries,struct rb_node *parent =NULL ;struct hist_entry *iter; -if (use_callchain) +if (use_callchain) { +if (callchain_param.mode ==CHAIN_GRAPH_REL ) { +u64 total = he->stat.period; + +if (symbol_conf.cumulate_callchain) + total = he->stat_acc->period; + + min_callchain_hits = total * (callchain_param.min_percent /100 ); + } callchain_param.sort (&he->sorted_chain, he->callchain, min_callchain_hits, &callchain_param); + }while (*p !=NULL ) { parent = *p;
@@ -1195,7 +1204,7 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog)else use_callchain = symbol_conf.use_callchain; - min_callchain_hits = hists->stats.total_period * (callchain_param.min_percent /100 ); + min_callchain_hits =hists__total_period (hists) * (callchain_param.min_percent /100 );if (sort__need_collapse) root = &hists->entries_collapsed;
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/10 perf hists: Update hists' total period when adding entries
In reply to Arnaldo Carvalho de MeloFrom: Namhyung Kim <[email protected]>
Currently the hist entry addition path doesn't update total_period of hists and it's calculated during 'resort' path. But the resort path needs to know the total period before doing its job because it's used for calculating percent limit of callchains in hist entries.
So this patch update the total period during the addition path. It makes the percent limit of callchains working (again).
--- tools/perf/util/hist.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +9 -2
@@ -432,8 +432,12 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, cmp =hist_entry__cmp (he, entry);if (!cmp) { -if (sample_self) +if (sample_self) {he_stat__add_period (&he->stat, period, weight); + hists->stats.total_period += period; +if (!he->filtered) + hists->stats.total_non_filtered_period += period; + }if (symbol_conf.cumulate_callchain)he_stat__add_period (he->stat_acc, period, weight);
@@ -466,7 +470,10 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,if (!he)return NULL ; - hists->nr_entries++; +if (sample_self) +hists__inc_stats (hists, he); +else + hists->nr_entries++;rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, hists->entries_in);
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/10 perf report: Apply --percent-limit to callchains also
In reply to Arnaldo Carvalho de MeloSee http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
Currently --percent-limit option only works for hist entries. However it'd be better to have same effect to callchains as well
--- tools/perf/builtin-report.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +7 -2
@@ -75,7 +75,10 @@ static int report__config(const char *var, const char *value, void *cb)return 0 ; }if (!strcmp (var,"report.percent-limit" )) { - rep->min_percent =strtof (value,NULL ); +double pcnt =strtof (value,NULL ); + + rep->min_percent = pcnt; + callchain_param.min_percent = pcnt;return 0 ; }if (!strcmp (var,"report.children" )) {
@@ -633,8 +636,10 @@ parse_percent_limit(const struct option *opt, const char *str, int unset __maybe_unused) {struct report *rep = opt->value; +double pcnt =strtof (str,NULL ); - rep->min_percent =strtof (str,NULL ); + rep->min_percent = pcnt; + callchain_param.min_percent = pcnt;return 0 ; }
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/10 perf report: Get rid of hist_entry__callchain_fprintf()
In reply to Arnaldo Carvalho de MeloFrom: Namhyung Kim <[email protected]>
It's just a wrapper function to align the start position ofcallchains to 'comm' of each thread if it's a first sort key. But it doesn't not work with tracepoint events and also with upcoming hierarchy view.
--- tools/perf/ui/stdio/hist.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-)
tools/perf/ui/stdio/hist.c +2 -25
@@ -349,30 +349,6 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he,return 0 ; } -static size_t hist_entry__callchain_fprintf (struct hist_entry *he, -struct hists *hists, -FILE *fp) -{ -int left_margin =0 ; -u64 total_period = hists->stats.total_period; - -if (field_order ==NULL && (sort_order ==NULL || - !prefixcmp (sort_order,"comm" ))) { -struct perf_hpp_fmt *fmt; - -perf_hpp__for_each_format (fmt) { -if (!perf_hpp__is_sort_entry (fmt)) -continue ; - -/* must be 'comm' sort entry */ - left_margin = fmt->width (fmt,NULL ,hists_to_evsel (hists)); - left_margin -=thread__comm_len (he->thread); -break ; - } - } -return hist_entry_callchain__fprintf (he, total_period, left_margin, fp); -} -static int hist_entry__snprintf (struct hist_entry *he,struct perf_hpp *hpp) {const char *sep = symbol_conf.field_sep;
@@ -418,6 +394,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, .buf = bf, .size = size, }; +u64 total_period = hists->stats.total_period;if (size ==0 || size > bfsz) size = hpp.size = bfsz;
@@ -427,7 +404,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, ret =fprintf (fp,"%s\n" , bf);if (symbol_conf.use_callchain) - ret +=hist_entry__callchain_fprintf (he, hists, fp); + ret +=hist_entry_callchain__fprintf (he, total_period,0 , fp);return ret; }
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/10 perf callchain: Pass parent_samples to __callchain__fprintf_graph()
In reply to Arnaldo Carvalho de MeloFrom: Namhyung Kim <[email protected]>
Pass hist entry's period to graph callchain print function. This info is needed by later patch to determine whether it can omit percentage of top-level node or not.
No functional change intended.
--- tools/perf/ui/stdio/hist.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
tools/perf/ui/stdio/hist.c +13 -6
@@ -166,7 +166,8 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root, }static size_t callchain__fprintf_graph (FILE *fp,struct rb_root *root, -u64 total_samples,int left_margin) +u64 total_samples,u64 parent_samples, +int left_margin) {struct callchain_node *cnode;struct callchain_list *chain;
@@ -213,6 +214,9 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, root = &cnode->rb_root; } +if (callchain_param.mode ==CHAIN_GRAPH_REL ) + total_samples = parent_samples; + ret +=__callchain__fprintf_graph (fp, root, total_samples,1 ,1 , left_margin); ret +=fprintf (fp,"\n" );
@@ -323,16 +327,19 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, u64 total_samples, int left_margin, FILE *fp) { + u64 parent_samples = he->stat.period; + +if (symbol_conf.cumulate_callchain) + parent_samples = he->stat_acc->period; +switch (callchain_param.mode) {case CHAIN_GRAPH_REL : - return callchain__fprintf_graph(fp, &he->sorted_chain, - symbol_conf.cumulate_callchain ? - he->stat_acc->period : he->stat.period, -left_margin ); +return callchain__fprintf_graph (fp, &he->sorted_chain, total_samples, + parent_samples, left_margin);break ;case CHAIN_GRAPH_ABS :return callchain__fprintf_graph (fp, &he->sorted_chain, total_samples, - left_margin); + parent_samples, left_margin);break ;case CHAIN_FLAT :return callchain__fprintf_flat (fp, &he->sorted_chain, total_samples);
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/10 perf report: Fix percent display in callchains on --stdio
In reply to Arnaldo Carvalho de MeloSee http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
When there's only a single callchain, perf doesn't print its percentage in front of the symbols. This is because it assumes that the percentage is same as parents. But if a percent limit is applied, it's possible that there are actually a couple of child nodes but only one of them is shown. In this case it should display the percent to prevent misunderstanding of its percentage is same as the parent's.
For example, let's see the following callchain.
$ perf report -s comm --percent-limit 0.01 --stdio
...
9.95% swapper
|
|--7.57%--intel_idle
| cpuidle_enter_state
| cpuidle_enter
| call_cpuidle
| cpu_startup_entry
| |
| |--4.89%--start_secondary
| |
| --2.68%--rest_init
| start_kernel
| x86_64_start_reservations
| x86_64_start_kernel
|
|--0.15%--__schedule
| |
| |--0.13%--schedule
| | schedule_preempt_disable
| | cpu_startup_entry
| | |
| | |--0.09%--start_secondary
| | |
| | --0.04%--rest_init
| | start_kernel
| | x86_64_start_reservations
| | x86_64_start_kernel
| |
| --0.01%--schedule_preempt_disabled
| cpu_startup_entry
...Current code omits the percent if 'intel_idle' becomes the only node when percent limit is set to 0.5%, its percent is not 9.95% but users will assume it incorrectly.
Before:
$ perf report --percent-limit 0.5 --stdio
...
9.95% swapper
|
---intel_idle
cpuidle_enter_state
cpuidle_enter
call_cpuidle
cpu_startup_entry
|
|--4.89%--start_secondary
|
--2.68%--rest_init
start_kernel
x86_64_start_reservations
x86_64_start_kernelAfter:
$ perf report --percent-limit 0.5 --stdio
...
9.95% swapper
|
--7.57%--intel_idle
cpuidle_enter_state
cpuidle_enter
call_cpuidle
cpu_startup_entry
|
|--4.89%--start_secondary
|
--2.68%--rest_init
start_kernel
x86_64_start_reservations
x86_64_start_kernel--- tools/perf/ui/stdio/hist.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
tools/perf/ui/stdio/hist.c +20 -6
@@ -165,6 +165,25 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root,return ret; } +/* +* If have one single callchain root, don't bother printing +* its percentage (100 % in fractal mode and the same percentage +* than the hist in graph mode). This also avoid one level of column. +* +* However when percent-limit applied, it's possible that single callchain +* node have different (non-100% in fractal mode) percentage. +*/ +static bool need_percent_display (struct rb_node *node,u64 parent_samples) +{ +struct callchain_node *cnode; + +if (rb_next (node)) +return true; + + cnode = rb_entry(node, struct callchain_node, rb_node); +return callchain_cumul_hits (cnode) != parent_samples; +} +static size_t callchain__fprintf_graph (FILE *fp,struct rb_root *root,u64 total_samples,u64 parent_samples,int left_margin)
@@ -178,13 +197,8 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,int ret =0 ;char bf[1024 ]; -/* -* If have one single callchain root, don't bother printing -* its percentage (100 % in fractal mode and the same percentage -* than the hist in graph mode). This also avoid one level of column. -*/ node =rb_first (root); -if (node && !rb_next (node)) { +if (node && !need_percent_display (node, parent_samples)) { cnode = rb_entry(node, struct callchain_node, rb_node);list_for_each_entry (chain, &cnode->val, list) {/*
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/10 perf hists browser: Fix dump to show correct callchain style
In reply to Arnaldo Carvalho de MeloSee http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
The commit 8c430a348699 ("perf hists browser: Support folded callchains") missed to update hist_browser__dump() so it always shows graph-style callchains regardless of current setting.
To fix that, factor out callchain printing code and rename the existing function which prints graph-style callchain.
--- tools/perf/ui/browsers/hists.c | 73 ++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 32 deletions(-)
tools/perf/ui/browsers/hists.c +41 -32
@@ -844,7 +844,7 @@ next:return row - first_row; } -static int hist_browser__show_callchain(struct hist_browser *browser, +static int hist_browser__show_callchain_graph(struct hist_browser *browser, struct rb_root *root, int level, unsigned short row, u64 total, print_callchain_entry_fn print,
@@ -898,7 +898,7 @@ static int hist_browser__show_callchain(struct hist_browser *browser,else new_total = total; - row +=hist_browser__show_callchain (browser, &child->rb_root, + row +=hist_browser__show_callchain_graph (browser, &child->rb_root, new_level, row, new_total, print, arg, is_output_full); }
@@ -910,6 +910,43 @@ out:return row - first_row; } +static int hist_browser__show_callchain (struct hist_browser *browser, +struct hist_entry *entry,int level, +unsigned short row, +print_callchain_entry_fn print, +struct callchain_print_arg *arg, +check_output_full_fn is_output_full) +{ +u64 total =hists__total_period (entry->hists); +int printed; + +if (callchain_param.mode ==CHAIN_GRAPH_REL ) { +if (symbol_conf.cumulate_callchain) + total = entry->stat_acc->period; +else + total = entry->stat.period; + } + +if (callchain_param.mode ==CHAIN_FLAT ) { + printed =hist_browser__show_callchain_flat (browser, + &entry->sorted_chain, row, total, + print, arg, is_output_full); + }else if (callchain_param.mode ==CHAIN_FOLDED ) { + printed =hist_browser__show_callchain_folded (browser, + &entry->sorted_chain, row, total, + print, arg, is_output_full); + }else { + printed =hist_browser__show_callchain_graph (browser, + &entry->sorted_chain, level, row, total, + print, arg, is_output_full); + } + +if (arg->is_current_entry) + browser->he_selection = entry; + +return printed; +} +struct hpp_arg {struct ui_browser *b;char folded_sign;
@@ -1084,38 +1121,14 @@ static int hist_browser__show_entry(struct hist_browser *browser, --row_offset;if (folded_sign =='-' && row != browser->b.rows) { -u64 total =hists__total_period (entry->hists);struct callchain_print_arg arg = { .row_offset = row_offset, .is_current_entry = current_entry, }; -if (callchain_param.mode ==CHAIN_GRAPH_REL ) { -if (symbol_conf.cumulate_callchain) - total = entry->stat_acc->period; -else - total = entry->stat.period; - } - -if (callchain_param.mode ==CHAIN_FLAT ) { - printed +=hist_browser__show_callchain_flat (browser, - &entry->sorted_chain, row, total, + printed +=hist_browser__show_callchain (browser, entry,1 , row, hist_browser__show_callchain_entry, &arg, hist_browser__check_output_full); - }else if (callchain_param.mode ==CHAIN_FOLDED ) { - printed +=hist_browser__show_callchain_folded (browser, - &entry->sorted_chain, row, total, - hist_browser__show_callchain_entry, &arg, - hist_browser__check_output_full); - }else { - printed +=hist_browser__show_callchain (browser, - &entry->sorted_chain,1 , row, total, - hist_browser__show_callchain_entry, &arg, - hist_browser__check_output_full); - } - -if (arg.is_current_entry) - browser->he_selection = entry; }return printed;
@@ -1380,15 +1393,11 @@ do_offset:static int hist_browser__fprintf_callchain (struct hist_browser *browser,struct hist_entry *he,FILE *fp) { -u64 total =hists__total_period (he->hists);struct callchain_print_arg arg = { .fp = fp, }; -if (symbol_conf.cumulate_callchain) - total = he->stat_acc->period; - -hist_browser__show_callchain (browser, &he->sorted_chain,1 ,0 , total, +hist_browser__show_callchain (browser, he,1 ,0 , hist_browser__fprintf_callchain_entry, &arg, hist_browser__check_dump_full);return arg.printed;
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 8/10 perf hists browser: Pass parent_total to callchain print functions
In reply to Arnaldo Carvalho de MeloSee http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
Pass parent node's total period to callchain print functions. This info is needed by later patch to determine whether it can omit percent or not correctly.
No functional change intended.
--- tools/perf/ui/browsers/hists.c | 44 +++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-)
tools/perf/ui/browsers/hists.c +24 -20
@@ -660,6 +660,7 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser,static int hist_browser__show_callchain_flat (struct hist_browser *browser,struct rb_root *root,unsigned short row,u64 total, +u64 parent_total__maybe_unused ,print_callchain_entry_fn print,struct callchain_print_arg *arg,check_output_full_fn is_output_full)
@@ -763,6 +764,7 @@ static char *hist_browser__folded_callchain_str(struct hist_browser *browser,static int hist_browser__show_callchain_folded (struct hist_browser *browser,struct rb_root *root,unsigned short row,u64 total, +u64 parent_total__maybe_unused ,print_callchain_entry_fn print,struct callchain_print_arg *arg,check_output_full_fn is_output_full)
@@ -847,14 +849,18 @@ next:static int hist_browser__show_callchain_graph (struct hist_browser *browser,struct rb_root *root,int level,unsigned short row,u64 total, +u64 parent_total,print_callchain_entry_fn print,struct callchain_print_arg *arg,check_output_full_fn is_output_full) {struct rb_node *node;int first_row = row, offset = level *LEVEL_OFFSET_STEP ; -u64 new_total;bool need_percent; +u64 percent_total = total; + +if (callchain_param.mode ==CHAIN_GRAPH_REL ) + percent_total = parent_total; node =rb_first (root); need_percent = node &&rb_next (node);
@@ -878,7 +884,7 @@ static int hist_browser__show_callchain_graph(struct hist_browser *browser, folded_sign =callchain_list__folded (chain); row +=hist_browser__show_callchain_list (browser, child, - chain, row, total, + chain, row, percent_total, was_first && need_percent, offset + extra_offset, print, arg);
@@ -893,13 +899,9 @@ static int hist_browser__show_callchain_graph(struct hist_browser *browser,if (folded_sign =='-' ) {const int new_level = level + (extra_offset ?2 :1 ); -if (callchain_param.mode ==CHAIN_GRAPH_REL ) - new_total = child->children_hit; -else - new_total = total; - row +=hist_browser__show_callchain_graph (browser, &child->rb_root, - new_level, row, new_total, + new_level, row, total, + child->children_hit, print, arg, is_output_full); }if (is_output_full (browser, row))
@@ -918,27 +920,29 @@ static int hist_browser__show_callchain(struct hist_browser *browser, check_output_full_fn is_output_full) {u64 total =hists__total_period (entry->hists); +u64 parent_total;int printed; -if (callchain_param.mode ==CHAIN_GRAPH_REL ) { -if (symbol_conf.cumulate_callchain) - total = entry->stat_acc->period; -else - total = entry->stat.period; - } +if (symbol_conf.cumulate_callchain) + parent_total = entry->stat_acc->period; +else + parent_total = entry->stat.period;if (callchain_param.mode ==CHAIN_FLAT ) { printed =hist_browser__show_callchain_flat (browser, - &entry->sorted_chain, row, total, - print, arg, is_output_full); + &entry->sorted_chain, row, + total, parent_total, print, arg, + is_output_full); }else if (callchain_param.mode ==CHAIN_FOLDED ) { printed =hist_browser__show_callchain_folded (browser, - &entry->sorted_chain, row, total, - print, arg, is_output_full); + &entry->sorted_chain, row, + total, parent_total, print, arg, + is_output_full); }else { printed =hist_browser__show_callchain_graph (browser, - &entry->sorted_chain, level, row, total, - print, arg, is_output_full); + &entry->sorted_chain, level, row, + total, parent_total, print, arg, + is_output_full); }if (arg->is_current_entry)
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 9/10 perf hists browser: Fix percent display in callchains
In reply to Arnaldo Carvalho de MeloFrom: Namhyung Kim <[email protected]>
When there's only a single callchain, perf doesn't print its percentage in front of the symbols. This is because it assumes that the percentage is same as parents. But if a percent limit is applied, it's possible that there are actually a couple of child nodes but only one of them is shown. In this case it should display the percent to prevent misunderstanding of its percentage is same as the parent's.
For example, let's see the following callchain.
$ perf report --no-children --percent-limit 0.01 --tui
...
- 0.06% sleep [kernel.vmlinux] [k] kmem_cache_alloc_trace
kmem_cache_alloc_trace
- perf_event_mmap
- 0.04% mmap_region
do_mmap_pgoff
- vm_mmap_pgoff
+ 0.02% sys_mmap_pgoff
+ 0.02% vm_mmap
+ 0.02% mprotect_fixupCurrent code omits the percent if 'mmap_region' becomes the only node when percent limit is set to 0.03%, its percent is not 0.06% but users will assume it incorrectly.
Before:
$ perf report --no-children --percent-limit 0.03 --tui
...
0.06% sleep [kernel.vmlinux] [k] kmem_cache_alloc_trace
kmem_cache_alloc_trace
- perf_event_mmap
- mmap_region
do_mmap_pgoff
vm_mmap_pgoffAfter:
$ perf report --no-children --percent-limit 0.03 --tui
...
0.06% sleep [kernel.vmlinux] [k] kmem_cache_alloc_trace
kmem_cache_alloc_trace
- perf_event_mmap
- 0.04% mmap_region
do_mmap_pgoff
vm_mmap_pgoff--- tools/perf/ui/browsers/hists.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
tools/perf/ui/browsers/hists.c +19 -5
@@ -657,10 +657,24 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser,return 1 ; } +static bool check_percent_display (struct rb_node *node,u64 parent_total) +{ +struct callchain_node *child; + +if (node ==NULL ) +return false; + +if (rb_next (node)) +return true; + + child = rb_entry(node, struct callchain_node, rb_node); +return callchain_cumul_hits (child) != parent_total; +} +static int hist_browser__show_callchain_flat (struct hist_browser *browser,struct rb_root *root,unsigned short row,u64 total, -u64 parent_total__maybe_unused , +u64 parent_total,print_callchain_entry_fn print,struct callchain_print_arg *arg,check_output_full_fn is_output_full)
@@ -670,7 +684,7 @@ static int hist_browser__show_callchain_flat(struct hist_browser *browser,bool need_percent; node =rb_first (root); - need_percent = node &&rb_next (node); + need_percent =check_percent_display (node, parent_total);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -764,7 +778,7 @@ static char *hist_browser__folded_callchain_str(struct hist_browser *browser,static int hist_browser__show_callchain_folded (struct hist_browser *browser,struct rb_root *root,unsigned short row,u64 total, -u64 parent_total__maybe_unused , +u64 parent_total,print_callchain_entry_fn print,struct callchain_print_arg *arg,check_output_full_fn is_output_full)
@@ -774,7 +788,7 @@ static int hist_browser__show_callchain_folded(struct hist_browser *browser,bool need_percent; node =rb_first (root); - need_percent = node &&rb_next (node); + need_percent =check_percent_display (node, parent_total);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -863,7 +877,7 @@ static int hist_browser__show_callchain_graph(struct hist_browser *browser, percent_total = parent_total; node =rb_first (root); - need_percent = node &&rb_next (node); + need_percent =check_percent_display (node, parent_total);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerPATCH 10/10 perf report: Don't show blank lines if entry has no callchain
In reply to Arnaldo Carvalho de MeloSee http://www.infradead.org/rpr.html
From: Namhyung Kim <[email protected]>
When all callchains of a hist entry is percent-limited, do not add a blank line at the end. It makes the entry look like it doesn't have callchains.
--- tools/perf/ui/stdio/hist.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/ui/stdio/hist.c +4 -1
@@ -233,7 +233,10 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, ret +=__callchain__fprintf_graph (fp, root, total_samples,1 ,1 , left_margin); - ret +=fprintf (fp,"\n" ); +if (ret) { +/* do not add a blank line if it printed nothing */ + ret +=fprintf (fp,"\n" ); + }return ret; }
Signature · 1 line
2.5.0
Quoted 45 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling, this is on top of two previous pull requests I
made,Thanks,
- Arnaldo
The following changes since commit
814568db641f6587c1e98a3a85f214cb6a30fe10:perf build: Align the names of the build tests: (2016-01-29 17:51:04 -0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-core-for-mingo-3for you to fetch changes up to
3848c23b19e07188bfa15e3d9a2ac27692f2ff3c:perf report: Don't show blank lines if entry has no callchain (2016-02-01 17:51:09 -0300)
----------------------------------------------------------------
perf/core callchain fixes and improvementsUser visible:
- Make --percent-limit apply to callchains also and fix some bugs related to --percent-limit (Namhyung Kim)
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Namhyung Kim (10):
perf hists: Fix min callchain hits calculation
perf hists: Update hists' total period when adding entries perf report: Apply --percent-limit to callchains also perf report: Get rid ofhist_entry__callchain_fprintf()perf callchain: Passparent_samplesto__callchain__fprintf_graph()perf report: Fix percent display in callchains on --stdio perf hists browser: Fix dump to show correct callchain style perf hists browser: Passparent_totalto callchain print functions perf hists browser: Fix percent display in callchains perf report: Don't show blank lines if entry has no callchain
Quoted 5 lines
tools/perf/builtin-report.c | 9 +++- tools/perf/ui/browsers/hists.c | 113 +++++++++++++++++++++++++---------------- tools/perf/ui/stdio/hist.c | 77 ++++++++++++++-------------- tools/perf/util/hist.c | 24 +++++++-- 4 files changed, 136 insertions(+), 87 deletions(-)
Pulled into tip:perf/core, thanks!
Ingo