perf hists browser: Cleanup callchain routines
Namhyung Kim
maintainercover perf hists browser: Cleanup callchain routines
Hello,
This patch fixes and cleans up TUI callchain routines. I tried to consolidate similar functions but not to break the current output with this change. Hope that it makes code more readable and maintainable.
It should not change any behavior and outputs. I verified it with expanding by 'E' key + dumping by 'P' key on TUI and then running "diff -u" results before and after the patchset.
Actually I have more changes that would change (or improve) some behavior and output. I'll post them after this patchset is merged.
You can get this from 'perf/callchain-fix-v1' branch on my tree:
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Any comments are welcome, thanks
Namhyung
Namhyung Kim (5):
perf hists browser: Fix children overhead dump
perf hists browser: Factor out hist_browser__show_callchain_entry() perf hists browser: Get rid of unused 'remaining' variable perf hists browser: Cleanup callchain print functions perf hists browser: Consolidate callchain print functions in TUI
tools/perf/ui/browsers/hists.c | 349 ++++++++++++++--------------------------- tools/perf/ui/hist.c | 2 +- 2 files changed, 117 insertions(+), 234 deletions(-)
Signature · 1 line
2.0.0
Namhyung Kim
maintainerPATCH 1/5 perf hists browser: Fix children overhead dump
When perf report runs on TUI, 'P' key dumps current screen to a file but it incorrectly displayed children overhead (as same of self overhead). This was because it fetched the value from self stats.
--- tools/perf/ui/hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/hist.c +1 -1
@@ -304,7 +304,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt, \ static int hpp__entry_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ - return hpp__fmt_acc(fmt, hpp, he, he_get_##_field, " %*.2f%%", \ + return hpp__fmt_acc(fmt, hpp, he, he_get_acc_##_field, " %*.2f%%", \ hpp_entry_scnprintf, true); \ }
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf hists browser: Fix children overhead dump
perf hists browser: Fix children overhead dump
Commit-ID: 2bfa152839e5adea66aa6309c94bf3a50a5d5d47 Gitweb: http://git.kernel.org/tip/2bfa152839e5adea66aa6309c94bf3a50a5d5d47 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 20 Aug 2014 17:07:56 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 20 Aug 2014 12:14:14 -0300
perf hists browser: Fix children overhead dump
When perf report runs on TUI, 'P' key dumps current screen to a file but it incorrectly displayed children overhead (as same of self overhead). This was because it fetched the value from self stats.
--- tools/perf/ui/hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/hist.c +1 -1
@@ -304,7 +304,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt, \ static int hpp__entry_##_type(struct perf_hpp_fmt *fmt, \struct perf_hpp *hpp,struct hist_entry *he) \ { \ - return hpp__fmt_acc(fmt, hpp, he, he_get_##_field, " %*.2f%%", \ + return hpp__fmt_acc(fmt, hpp, he, he_get_acc_##_field, " %*.2f%%", \ hpp_entry_scnprintf, true); \ }
Namhyung Kim
maintainerPATCH 2/5 perf hists browser: Factor out hist_browser__show_callchain_entry()
In reply to Namhyung KimFactor out duplicate callchain printing code into the hist_browser__ show_callchain_entry().
--- tools/perf/ui/browsers/hists.c | 64 ++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 31 deletions(-)
tools/perf/ui/browsers/hists.c +33 -31
@@ -477,6 +477,29 @@ static char *callchain_list__sym_name(struct callchain_list *cl,return bf; } +static void hist_browser__show_callchain_entry (struct hist_browser *browser, +struct callchain_list *chain, +unsigned short row,int offset, +char folded_sign,const char *str, +bool *is_current_entry) +{ +int color, width; + + color =HE_COLORSET_NORMAL ; + width = browser->b.width - (offset +2 ); +if (ui_browser__is_current_entry (&browser->b, row)) { + browser->selection = &chain->ms; + color =HE_COLORSET_SELECTED ; + *is_current_entry = true; + } + +ui_browser__set_color (&browser->b, color); +hist_browser__gotorc (browser, row,0 ); +slsmg_write_nstring (" " , offset); +slsmg_printf ("%c " , folded_sign); +slsmg_write_nstring (str, width); +} +#define LEVEL_OFFSET_STEP 3 static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browser,
@@ -487,7 +510,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse bool *is_current_entry) {struct rb_node *node; -int first_row = row, width, offset = level *LEVEL_OFFSET_STEP ; +int first_row = row, offset = level *LEVEL_OFFSET_STEP ;u64 new_total, remaining;if (callchain_param.mode ==CHAIN_GRAPH_REL )
@@ -511,7 +534,6 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browselist_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str; -int color;bool was_first = first;if (first)
@@ -537,19 +559,10 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse str = alloc_str; } - color =HE_COLORSET_NORMAL ; - width = browser->b.width - (offset + extra_offset +2 ); -if (ui_browser__is_current_entry (&browser->b, row)) { - browser->selection = &chain->ms; - color =HE_COLORSET_SELECTED ; - *is_current_entry = true; - } - -ui_browser__set_color (&browser->b, color); -hist_browser__gotorc (browser, row,0 ); -slsmg_write_nstring (" " , offset + extra_offset); -slsmg_printf ("%c " , folded_sign); -slsmg_write_nstring (str, width); +hist_browser__show_callchain_entry (browser, chain, row, + offset + extra_offset, + folded_sign, str, + is_current_entry);free (alloc_str);if (++row == browser->b.rows)
@@ -580,14 +593,12 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser, bool *is_current_entry) {struct callchain_list *chain; -int first_row = row, - offset = level *LEVEL_OFFSET_STEP , - width = browser->b.width - offset; +int first_row = row; +int offset = level *LEVEL_OFFSET_STEP ;char folded_sign =' ' ;list_for_each_entry (chain, &node->val, list) {char bf[1024 ], *s; -int color; folded_sign =callchain_list__folded (chain);
@@ -596,20 +607,11 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser,continue ; } - color =HE_COLORSET_NORMAL ; -if (ui_browser__is_current_entry (&browser->b, row)) { - browser->selection = &chain->ms; - color =HE_COLORSET_SELECTED ; - *is_current_entry = true; - } - s =callchain_list__sym_name (chain, bf,sizeof (bf), browser->show_dso); -hist_browser__gotorc (browser, row,0 ); -ui_browser__set_color (&browser->b, color); -slsmg_write_nstring (" " , offset); -slsmg_printf ("%c " , folded_sign); -slsmg_write_nstring (s, width -2 ); +hist_browser__show_callchain_entry (browser, chain, row, + offset, folded_sign, s, + is_current_entry);if (++row == browser->b.rows) goto out;
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf hists browser: Factor out hist_browser__show_callchain_entry()
perf hists browser: Factor out hist_browser__show_callchain_entry()
Commit-ID: f4536ddd20d93b70d432b7ca5db873525e23c2c4 Gitweb: http://git.kernel.org/tip/f4536ddd20d93b70d432b7ca5db873525e23c2c4 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 20 Aug 2014 17:07:57 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 20 Aug 2014 12:14:58 -0300
perf hists browser: Factor out hist_browser__show_callchain_entry()
Factor out duplicate callchain printing code into the hist_browser__ show_callchain_entry().
--- tools/perf/ui/browsers/hists.c | 64 ++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 31 deletions(-)
tools/perf/ui/browsers/hists.c +33 -31
@@ -477,6 +477,29 @@ static char *callchain_list__sym_name(struct callchain_list *cl,return bf; } +static void hist_browser__show_callchain_entry (struct hist_browser *browser, +struct callchain_list *chain, +unsigned short row,int offset, +char folded_sign,const char *str, +bool *is_current_entry) +{ +int color, width; + + color =HE_COLORSET_NORMAL ; + width = browser->b.width - (offset +2 ); +if (ui_browser__is_current_entry (&browser->b, row)) { + browser->selection = &chain->ms; + color =HE_COLORSET_SELECTED ; + *is_current_entry = true; + } + +ui_browser__set_color (&browser->b, color); +hist_browser__gotorc (browser, row,0 ); +slsmg_write_nstring (" " , offset); +slsmg_printf ("%c " , folded_sign); +slsmg_write_nstring (str, width); +} +#define LEVEL_OFFSET_STEP 3 static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browser,
@@ -487,7 +510,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse bool *is_current_entry) {struct rb_node *node; -int first_row = row, width, offset = level *LEVEL_OFFSET_STEP ; +int first_row = row, offset = level *LEVEL_OFFSET_STEP ;u64 new_total;if (callchain_param.mode ==CHAIN_GRAPH_REL )
@@ -508,7 +531,6 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browselist_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str; -int color;bool was_first = first;if (first)
@@ -534,19 +556,10 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse str = alloc_str; } - color =HE_COLORSET_NORMAL ; - width = browser->b.width - (offset + extra_offset +2 ); -if (ui_browser__is_current_entry (&browser->b, row)) { - browser->selection = &chain->ms; - color =HE_COLORSET_SELECTED ; - *is_current_entry = true; - } - -ui_browser__set_color (&browser->b, color); -hist_browser__gotorc (browser, row,0 ); -slsmg_write_nstring (" " , offset + extra_offset); -slsmg_printf ("%c " , folded_sign); -slsmg_write_nstring (str, width); +hist_browser__show_callchain_entry (browser, chain, row, + offset + extra_offset, + folded_sign, str, + is_current_entry);free (alloc_str);if (++row == browser->b.rows)
@@ -577,14 +590,12 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser, bool *is_current_entry) {struct callchain_list *chain; -int first_row = row, - offset = level *LEVEL_OFFSET_STEP , - width = browser->b.width - offset; +int first_row = row; +int offset = level *LEVEL_OFFSET_STEP ;char folded_sign =' ' ;list_for_each_entry (chain, &node->val, list) {char bf[1024 ], *s; -int color; folded_sign =callchain_list__folded (chain);
@@ -593,20 +604,11 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser,continue ; } - color =HE_COLORSET_NORMAL ; -if (ui_browser__is_current_entry (&browser->b, row)) { - browser->selection = &chain->ms; - color =HE_COLORSET_SELECTED ; - *is_current_entry = true; - } - s =callchain_list__sym_name (chain, bf,sizeof (bf), browser->show_dso); -hist_browser__gotorc (browser, row,0 ); -ui_browser__set_color (&browser->b, color); -slsmg_write_nstring (" " , offset); -slsmg_printf ("%c " , folded_sign); -slsmg_write_nstring (s, width -2 ); +hist_browser__show_callchain_entry (browser, chain, row, + offset, folded_sign, s, + is_current_entry);if (++row == browser->b.rows) goto out;
Namhyung Kim
maintainerPATCH 3/5 perf hists browser: Get rid of unused 'remaining' variable
In reply to Namhyung KimIt seems that the 'remaining' variable is not used by any real code.
--- tools/perf/ui/browsers/hists.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
tools/perf/ui/browsers/hists.c +2 -8
@@ -511,14 +511,13 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse {struct rb_node *node;int first_row = row, offset = level *LEVEL_OFFSET_STEP ; -u64 new_total, remaining; +u64 new_total;if (callchain_param.mode ==CHAIN_GRAPH_REL ) new_total = chain_node->children_hit;else new_total = total; - remaining = new_total; node =rb_first (&chain_node->rb_root);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -529,8 +528,6 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browseint first = true;int extra_offset =0 ; - remaining -= cumul; -list_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str;
@@ -1086,7 +1083,7 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *bro {struct rb_node *node;int offset = level *LEVEL_OFFSET_STEP ; -u64 new_total, remaining; +u64 new_total;int printed =0 ;if (callchain_param.mode ==CHAIN_GRAPH_REL )
@@ -1094,7 +1091,6 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *broelse new_total = total; - remaining = new_total; node =rb_first (&chain_node->rb_root);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -1105,8 +1101,6 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *broint first = true;int extra_offset =0 ; - remaining -= cumul; -list_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str;
Signature · 1 line
2.0.0
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf hists browser: Get rid of unused 'remaining' variable
perf hists browser: Get rid of unused 'remaining' variable
Commit-ID: 36e15dd4027a9b088264758fea292b6e876b5cdd Gitweb: http://git.kernel.org/tip/36e15dd4027a9b088264758fea292b6e876b5cdd Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 20 Aug 2014 17:07:58 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 20 Aug 2014 12:14:11 -0300
perf hists browser: Get rid of unused 'remaining' variable
It seems that the 'remaining' variable is not used by any real code.
--- tools/perf/ui/browsers/hists.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
tools/perf/ui/browsers/hists.c +2 -8
@@ -488,14 +488,13 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse {struct rb_node *node;int first_row = row, width, offset = level *LEVEL_OFFSET_STEP ; -u64 new_total, remaining; +u64 new_total;if (callchain_param.mode ==CHAIN_GRAPH_REL ) new_total = chain_node->children_hit;else new_total = total; - remaining = new_total; node =rb_first (&chain_node->rb_root);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -506,8 +505,6 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browseint first = true;int extra_offset =0 ; - remaining -= cumul; -list_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str;
@@ -1084,7 +1081,7 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *bro {struct rb_node *node;int offset = level *LEVEL_OFFSET_STEP ; -u64 new_total, remaining; +u64 new_total;int printed =0 ;if (callchain_param.mode ==CHAIN_GRAPH_REL )
@@ -1092,7 +1089,6 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *broelse new_total = total; - remaining = new_total; node =rb_first (&chain_node->rb_root);while (node) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
@@ -1103,8 +1099,6 @@ static int hist_browser__fprintf_callchain_node_rb_tree(struct hist_browser *broint first = true;int extra_offset =0 ; - remaining -= cumul; -list_for_each_entry (chain, &child->val, list) {char bf[1024 ], *alloc_str;const char *str;
Namhyung Kim
maintainerPATCH 4/5 perf hists browser: Cleanup callchain print functions
In reply to Namhyung KimThe hist_browser__show_callchain() and friends don't need to be that complex. Simplify the function and consolidate the logic into a single function. It should have no functional change.
--- tools/perf/ui/browsers/hists.c | 120 +++++++++++------------------------------ 1 file changed, 32 insertions(+), 88 deletions(-)
tools/perf/ui/browsers/hists.c +32 -88
@@ -502,26 +502,19 @@ static void hist_browser__show_callchain_entry(struct hist_browser *browser,#define LEVEL_OFFSET_STEP 3 -static int hist_browser__show_callchain_node_rb_tree (struct hist_browser *browser, -struct callchain_node *chain_node, -u64 total,int level, -unsigned short row, -off_t *row_offset, -bool *is_current_entry) +static int hist_browser__show_callchain (struct hist_browser *browser, +struct rb_root *root,int level, +unsigned short row,off_t *row_offset, +u64 total,bool *is_current_entry) {struct rb_node *node; -int first_row = row, offset = level *LEVEL_OFFSET_STEP ; +int first_row = row; +int offset = level *LEVEL_OFFSET_STEP ; +bool has_single_node = (rb_first (root) ==rb_last (root));u64 new_total; -if (callchain_param.mode ==CHAIN_GRAPH_REL ) - new_total = chain_node->children_hit; -else - new_total = total; - - node =rb_first (&chain_node->rb_root); -while (node) { +for (node =rb_first (root); node; node =rb_next (node)) { struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node); -struct rb_node *next =rb_next (node);u64 cumul =callchain_cumul_hits (child);struct callchain_list *chain;char folded_sign =' ' ;
@@ -535,7 +528,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browseif (first) first = false; -else +else if (!has_single_node || level >1 ) extra_offset =LEVEL_OFFSET_STEP ; folded_sign =callchain_list__folded (chain);
@@ -547,8 +540,9 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse alloc_str =NULL ; str =callchain_list__sym_name (chain, bf,sizeof (bf), browser->show_dso); -if (was_first) { -double percent = cumul *100.0 / new_total; + +if (was_first && (!has_single_node || level >1 )) { +double percent = cumul *100.0 / total;if (asprintf (&alloc_str,"%2.2f%% %s" , percent, str) <0 ) str ="Not enough memory!" ;
@@ -569,80 +563,23 @@ do_next:break ; } -if (folded_sign =='-' ) { -const int new_level = level + (extra_offset ?2 :1 ); - row +=hist_browser__show_callchain_node_rb_tree (browser, child, new_total, - new_level, row, row_offset, - is_current_entry); - } -if (row == browser->b.rows) - goto out; - node = next; - } -out: -return row - first_row; -} - -static int hist_browser__show_callchain_node (struct hist_browser *browser, -struct callchain_node *node, -int level,unsigned short row, -off_t *row_offset, -bool *is_current_entry) -{ -struct callchain_list *chain; -int first_row = row; -int offset = level *LEVEL_OFFSET_STEP ; -char folded_sign =' ' ; - -list_for_each_entry (chain, &node->val, list) { -char bf[1024 ], *s; - - folded_sign =callchain_list__folded (chain); - -if (*row_offset !=0 ) { - --*row_offset; +if (folded_sign !='-' )continue ; - } - - s =callchain_list__sym_name (chain, bf,sizeof (bf), - browser->show_dso); -hist_browser__show_callchain_entry (browser, chain, row, - offset, folded_sign, s, - is_current_entry); - -if (++row == browser->b.rows) - goto out; - } - -if (folded_sign =='-' ) - row +=hist_browser__show_callchain_node_rb_tree (browser, node, - browser->hists->stats.total_period, - level +1 , row, - row_offset, - is_current_entry); -out: -return row - first_row; -} - -static int hist_browser__show_callchain (struct hist_browser *browser, -struct rb_root *chain, -int level,unsigned short row, -off_t *row_offset, -bool *is_current_entry) -{ -struct rb_node *nd; -int first_row = row; -for (nd =rb_first (chain); nd; nd =rb_next (nd)) { - struct callchain_node *node = rb_entry(nd, struct callchain_node, rb_node); +if (callchain_param.mode ==CHAIN_GRAPH_REL ) + new_total = child->children_hit; +else + new_total = total; - row +=hist_browser__show_callchain_node (browser, node, level, - row, row_offset, - is_current_entry); + row +=hist_browser__show_callchain (browser, &child->rb_root, + level +1 + !!extra_offset, + row, row_offset, + new_total, + is_current_entry);if (row == browser->b.rows)break ; } - +out:return row - first_row; }
@@ -817,9 +754,16 @@ static int hist_browser__show_entry(struct hist_browser *browser, --row_offset;if (folded_sign =='-' && row != browser->b.rows) { - printed +=hist_browser__show_callchain (browser, &entry->sorted_chain, +u64 total =hists__total_period (entry->hists); + +if (symbol_conf.cumulate_callchain) + total = entry->stat_acc->period; + + printed +=hist_browser__show_callchain (browser, + &entry->sorted_chain,1 , row, &row_offset, - ¤t_entry); + total, ¤t_entry); +if (current_entry) browser->he_selection = entry; }
Signature · 1 line
2.0.0
Namhyung Kim
maintainerPATCH 5/5 perf hists browser: Consolidate callchain print functions in TUI
In reply to Namhyung KimCurrently there're two callchain print functions in TUI - one for the hists browser and another for file dump. They do almost same job so it'd be better consolidate the codes.
--- tools/perf/ui/browsers/hists.c | 211 +++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 134 deletions(-)
tools/perf/ui/browsers/hists.c +77 -134
@@ -477,20 +477,32 @@ static char *callchain_list__sym_name(struct callchain_list *cl,return bf; } +struct callchain_print_arg { +/* for hists browser */ +unsigned short row; +off_t row_offset; +bool is_current_entry; + +/* for file dump */ +FILE *fp; +int printed; +}; +static void hist_browser__show_callchain_entry (struct hist_browser *browser,struct callchain_list *chain, -unsigned short row,int offset, -char folded_sign,const char *str, -bool *is_current_entry) +const char *str,int offset, +struct callchain_print_arg *arg) {int color, width; +unsigned short row = arg->row; +char folded_sign =callchain_list__folded (chain); color =HE_COLORSET_NORMAL ; width = browser->b.width - (offset +2 );if (ui_browser__is_current_entry (&browser->b, row)) { browser->selection = &chain->ms; color =HE_COLORSET_SELECTED ; - *is_current_entry = true; + arg->is_current_entry = true; }ui_browser__set_color (&browser->b, color);
@@ -498,17 +510,40 @@ static void hist_browser__show_callchain_entry(struct hist_browser *browser,slsmg_write_nstring (" " , offset);slsmg_printf ("%c " , folded_sign);slsmg_write_nstring (str, width); + +/* +* increase row here so that we can reuse the +* hist_browser__show_callchain() for dumping the whole +* callchain to a file. +*/ + arg->row++; +} + +static void hist_browser__fprintf_callchain_entry (struct hist_browser *b__maybe_unused , +struct callchain_list *chain, +const char *str,int offset, +struct callchain_print_arg *arg) +{ +char folded_sign =callchain_list__folded (chain); + + arg->printed +=fprintf (arg->fp,"%*s%c %s\n" , offset," " , + folded_sign, str); } +typedef void (*print_callchain_entry_fn )(struct hist_browser *browser, +struct callchain_list *chain, +const char *str,int offset, +struct callchain_print_arg *arg); +#define LEVEL_OFFSET_STEP 3static int hist_browser__show_callchain (struct hist_browser *browser, -struct rb_root *root,int level, -unsigned short row,off_t *row_offset, -u64 total,bool *is_current_entry) +struct rb_root *root,int level,u64 total, +print_callchain_entry_fn print, +struct callchain_print_arg *arg) {struct rb_node *node; -int first_row = row; +int first_row = arg->row;int offset = level *LEVEL_OFFSET_STEP ;bool has_single_node = (rb_first (root) ==rb_last (root));u64 new_total;
@@ -532,8 +567,8 @@ static int hist_browser__show_callchain(struct hist_browser *browser, extra_offset =LEVEL_OFFSET_STEP ; folded_sign =callchain_list__folded (chain); -if (*row_offset !=0 ) { - --*row_offset; +if (arg->row_offset !=0 ) { + arg->row_offset--; goto do_next; }
@@ -550,13 +585,11 @@ static int hist_browser__show_callchain(struct hist_browser *browser, str = alloc_str; } -hist_browser__show_callchain_entry (browser, chain, row, - offset + extra_offset, - folded_sign, str, - is_current_entry); +free (alloc_str); -if (++row == browser->b.rows) +if (arg->row == browser->b.rows) goto out; do_next:if (folded_sign =='+' )
@@ -571,16 +604,15 @@ do_next: else new_total = total; - row +=hist_browser__show_callchain (browser, &child->rb_root, - level +1 + !!extra_offset, - row, row_offset, - new_total, - is_current_entry); -if (row == browser->b.rows) +hist_browser__show_callchain (browser, &child->rb_root, + level +1 + !!extra_offset, + new_total, print, arg); + +if (arg->row == browser->b.rows)break ; } out: -return row - first_row; +return arg->row - first_row; }struct hpp_arg {
@@ -755,16 +787,21 @@ static int hist_browser__show_entry(struct hist_browser *browser,if (folded_sign =='-' && row != browser->b.rows) {u64 total =hists__total_period (entry->hists); +struct callchain_print_arg arg = { + .row = row, + .row_offset = row_offset, + .is_current_entry = current_entry, + };if (symbol_conf.cumulate_callchain) total = entry->stat_acc->period; printed +=hist_browser__show_callchain (browser, - &entry->sorted_chain, -1 , row, &row_offset, - total, ¤t_entry); + &entry->sorted_chain,1 , total, + hist_browser__show_callchain_entry, + &arg); -if (current_entry) +if (arg.is_current_entry) browser->he_selection = entry; }
@@ -1020,112 +1057,6 @@ do_offset: } } -static int hist_browser__fprintf_callchain_node_rb_tree (struct hist_browser *browser, -struct callchain_node *chain_node, -u64 total,int level, -FILE *fp) -{ -struct rb_node *node; -int offset = level *LEVEL_OFFSET_STEP ; -u64 new_total; -int printed =0 ; - -if (callchain_param.mode ==CHAIN_GRAPH_REL ) - new_total = chain_node->children_hit; -else - new_total = total; - - node =rb_first (&chain_node->rb_root); -while (node) { - struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node); -struct rb_node *next =rb_next (node); -u64 cumul =callchain_cumul_hits (child); -struct callchain_list *chain; -char folded_sign =' ' ; -int first = true; -int extra_offset =0 ; - -list_for_each_entry (chain, &child->val, list) { -char bf[1024 ], *alloc_str; -const char *str; -bool was_first = first; - -if (first) - first = false; -else - extra_offset =LEVEL_OFFSET_STEP ; - - folded_sign =callchain_list__folded (chain); - - alloc_str =NULL ; - str =callchain_list__sym_name (chain, bf,sizeof (bf), - browser->show_dso); -if (was_first) { -double percent = cumul *100.0 / new_total; - -if (asprintf (&alloc_str,"%2.2f%% %s" , percent, str) <0 ) - str ="Not enough memory!" ; -else - str = alloc_str; - } - - printed +=fprintf (fp,"%*s%c %s\n" , offset + extra_offset," " , folded_sign, str); -free (alloc_str); -if (folded_sign =='+' ) -break ; - } - -if (folded_sign =='-' ) { -const int new_level = level + (extra_offset ?2 :1 ); - printed +=hist_browser__fprintf_callchain_node_rb_tree (browser, child, new_total, - new_level, fp); - } - - node = next; - } - -return printed; -} - -static int hist_browser__fprintf_callchain_node (struct hist_browser *browser, -struct callchain_node *node, -int level,FILE *fp) -{ -struct callchain_list *chain; -int offset = level *LEVEL_OFFSET_STEP ; -char folded_sign =' ' ; -int printed =0 ; - -list_for_each_entry (chain, &node->val, list) { -char bf[1024 ], *s; - - folded_sign =callchain_list__folded (chain); - s =callchain_list__sym_name (chain, bf,sizeof (bf), browser->show_dso); - printed +=fprintf (fp,"%*s%c %s\n" , offset," " , folded_sign, s); - } - -if (folded_sign =='-' ) - printed +=hist_browser__fprintf_callchain_node_rb_tree (browser, node, - browser->hists->stats.total_period, - level +1 , fp); -return printed; -} - -static int hist_browser__fprintf_callchain (struct hist_browser *browser, -struct rb_root *chain,int level,FILE *fp) -{ -struct rb_node *nd; -int printed =0 ; - -for (nd =rb_first (chain); nd; nd =rb_next (nd)) { - struct callchain_node *node = rb_entry(nd, struct callchain_node, rb_node); - - printed +=hist_browser__fprintf_callchain_node (browser, node, level, fp); - } - -return printed; -} -static int hist_browser__fprintf_entry (struct hist_browser *browser,struct hist_entry *he,FILE *fp) {
@@ -1161,8 +1092,20 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser, } printed +=fprintf (fp,"%s\n" ,rtrim (s)); -if (folded_sign =='-' ) - printed +=hist_browser__fprintf_callchain (browser, &he->sorted_chain,1 , fp); +if (folded_sign =='-' ) { +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 , total, + hist_browser__fprintf_callchain_entry, + &arg); + printed += arg.printed; + }return printed; }
Signature · 1 line
2.0.0