perf tools: Add support for hierachy view (v6)
Namhyung Kim
maintainercover perf tools: Add support for hierachy view (v6)
Hello,
This patchset implements a new feature that collects hist entries in a hierachical manner. That means lower-level entries belong to an upper-level entry. The entry hierachy is built on the sort keys given, so users can set it whatever they want. It only shows top-level entries first, and user can expand/collapse it dynamically.
The patch 01 is a bug fix and can be applied separately. The patch 02 to 08 are preparation of the hierarchy patchset and it handles the error path properly. The patch 09 to 15 implements basic logic of the hierarchy mode and the rest adds support for each UI.
* Changes from v5)
- separate resort after filter (Jiri)
- count sort keys when register (Jiri)
- add enum hierarchy_move_dir (Jiri)
* Changes from v4)
- rebased onto the current acme/perf/core
- fix memory leak on callchian_merge error path (Arnaldo)
- fix a bug on perf-top regarding percent calculation
- split hierarchy filtering code
* Changes from v3)
- rebased onto the percent limit patchset v2
* Changes from v2)
- check memory allocation failure in hists__hierarchy_insert_entry (Jiri)
- remove unused rb_hierarchy_first() (Arnaldo)
- support callchain percent limit (Andi)
- break TUI context menu cleanup (Arnaldo)
This time I implemented it for every output browser including TUI. A screenshot on TUI looks like below:
For normal output:
$ perf report --tui
Samples: 3K of event 'cycles:pp', Event count (approx.): 1695979674
Overhead Command Shared Object Symbol
------------------------------------------------------------------------
- 7.57% swapper [kernel.vmlinux] [k] intel_idle
intel_idle
cpuidle_enter_state
cpuidle_enter
call_cpuidle
+ cpu_startup_entry
+ 1.16 firefox firefox [.] 0x00000000000019433
+ 0.97% firefox libpthread-2.22.so [.] pthread_mutex_lock
...With hierarchy view,
$ perf report --tui --hierarchy
Samples: 3K of event 'cycles:pp', Event count (approx.): 1695979674
Overhead Command / Shared Object / Symbol
-------------------------------------------------------------------
+ 76.30% firefox
- 9.95% swapper
- 9.51% [kernel.vmlinux]
- 7.57 [k] intel_idle
intel_idle
cpuidle_enter_state
cpuidle_enter
call_cpuidle
+ cpu_startup_entry
+ 0.15% [k] __schedule
+ 0.12% [k] menu_select
...
+ 0.34% [sdhci]
+ 0.06% [e1000e]
...
+ 5.65% Xorg
+ 5.42% Socket Thread
...As you can see, overhead of an upper level entry is the sum of overhead of lower level entries. The entries are aligned by its order of matching sort keys.
This is available from 'perf/hierarchy-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 (25):
perf hists browser: Fix percentage update on key press perf callchain: Check return value of add_child()
perf callchain: Check return value of fill_node()
perf callchain: Add enum match_result for match_chain() perf callchain: Check return value of split_add_child() perf callchain: Check return value of append_chain_children() perf hists: Return error from hists__collapse_resort() perf report: Check error during report__collapse_hists() perf hists: Basic support of hierarchical report view perf hists: Resort hist entries with hierarchy
perf hists: Add helper functions for hierarchy mode perf hists: Introduce hist_entry__filter()
perf hists: Support filtering in hierarchy mode
perf hists: Resort after filtering hierarchy
perf hists: Count number of sort keys
perf ui/stdio: Implement hierarchy output mode
perf ui/stdio: Align column header for hierarchy output perf hists browser: Count number of hierarchy entries perf hists browser: Support collapsing/expanding whole entries in
hierarchy
perf hists browser: Implement hierarchy output
perf hists browser: Align column header in hierarchy mode perf ui/gtk: Implement hierarchy output mode
perf report: Add --hierarchy option
perf hists: Support decaying in hierarchy mode
perf top: Add --hierarchy option
tools/perf/Documentation/perf-report.txt | 3 + tools/perf/Documentation/perf-top.txt | 3 + tools/perf/Documentation/tips.txt | 1 + tools/perf/builtin-report.c | 31 +- tools/perf/builtin-top.c | 15 + tools/perf/ui/browsers/hists.c | 481 ++++++++++++++++++++++++++--- tools/perf/ui/gtk/hists.c | 161 +++++++++- tools/perf/ui/hist.c | 3 + tools/perf/ui/stdio/hist.c | 175 ++++++++++- tools/perf/util/callchain.c | 102 +++++-- tools/perf/util/ctype.c | 9 + tools/perf/util/hist.c | 498 ++++++++++++++++++++++++++++--- tools/perf/util/hist.h | 27 +- tools/perf/util/sort.c | 113 +++++++ tools/perf/util/sort.h | 14 +- tools/perf/util/symbol.h | 3 +- tools/perf/util/util.h | 2 + 17 files changed, 1524 insertions(+), 117 deletions(-)
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 1/25 perf hists browser: Fix percentage update on key press
Currently 'perf top --tui' decrements percentage of all entries on any key press. This is because it adds total period as new samples are added to hists. As perf-top does it currently but added samples are not passed to the display thread, the percentages are decresing continuously.
So separate total period stat into a different variable so that it cannot affect the output total period. This new total period stats are used only for calcualating callchain percent limit.
--- tools/perf/util/hist.c | 26 +++++++++++++++++++------- tools/perf/util/hist.h | 2 ++ 2 files changed, 21 insertions(+), 7 deletions(-)
tools/perf/util/hist.c +19 -7
@@ -405,6 +405,16 @@ static u8 symbol__parent_filter(const struct symbol *parent)return 0 ; } +static void hist_entry__add_callchain_period (struct hist_entry *he,u64 period) +{ +if (!symbol_conf.use_callchain) +return ; + + he->hists->callchain_period += period; +if (!he->filtered) + he->hists->callchain_non_filtered_period += period; +} + static struct hist_entry *hists__findnew_entry(struct hists *hists, struct hist_entry *entry, struct addr_location *al,
@@ -434,9 +444,7 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,if (!cmp) {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; +hist_entry__add_callchain_period (he, period); }if (symbol_conf.cumulate_callchain)he_stat__add_period (he->stat_acc, period, weight);
@@ -471,9 +479,8 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,return NULL ;if (sample_self) -hists__inc_stats (hists, he); -else - hists->nr_entries++; +hist_entry__add_callchain_period (he, period); + hists->nr_entries++;rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, hists->entries_in);
@@ -1227,9 +1234,14 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,struct rb_root *root;struct rb_node *next;struct hist_entry *n; +u64 callchain_total;u64 min_callchain_hits; - min_callchain_hits =hists__total_period (hists) * (callchain_param.min_percent /100 ); + callchain_total = hists->callchain_period; +if (symbol_conf.filter_relative) + callchain_total = hists->callchain_non_filtered_period; + + min_callchain_hits = callchain_total * (callchain_param.min_percent /100 );if (sort__need_collapse) root = &hists->entries_collapsed;
tools/perf/util/hist.h +2 -0
@@ -66,6 +66,8 @@ struct hists {struct rb_root entries_collapsed;u64 nr_entries;u64 nr_non_filtered_entries; +u64 callchain_period; +u64 callchain_non_filtered_period;struct thread *thread_filter;const struct dso *dso_filter;const char *uid_filter_str;
Signature · 1 line
2.7.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v6 01/25] perf hists browser: Fix percentage update on key press
Em Tue, Feb 16, 2016 at 11:08:19PM +0900, Namhyung Kim escreveu:
Quoted 9 lines
Currently 'perf top --tui' decrements percentage of all entries on any key press. This is because it adds total period as new samples are added to hists. As perf-top does it currently but added samples are not passed to the display thread, the percentages are decresing continuously.
So separate total period stat into a different variable so that it cannot affect the output total period. This new total period stats are used only for calcualating callchain percent limit.
I'm trying to figure this out now, but please next time add a line like
This helps reviewing as well as to figure out if this needs to go to [email protected], etc.
- Arnaldo
Quoted 81 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/hist.c | 26 +++++++++++++++++++------- tools/perf/util/hist.h | 2 ++ 2 files changed, 21 insertions(+), 7 deletions(-)tools/perf/util/hist.c +19
-7@@ -405,6 +405,16 @@ static u8 symbol__parent_filter(const struct symbol *parent)return 0 ; } +static void hist_entry__add_callchain_period (struct hist_entry *he,u64 period) +{ +if (!symbol_conf.use_callchain) +return ; + + he->hists->callchain_period += period; +if (!he->filtered) + he->hists->callchain_non_filtered_period += period; +} + static struct hist_entry *hists__findnew_entry(struct hists *hists, struct hist_entry *entry, struct addr_location *al,@@ -434,9 +444,7 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,if (!cmp) {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; +hist_entry__add_callchain_period (he, period); }if (symbol_conf.cumulate_callchain)he_stat__add_period (he->stat_acc, period, weight);@@ -471,9 +479,8 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,return NULL ;if (sample_self) -hists__inc_stats (hists, he); -else - hists->nr_entries++; +hist_entry__add_callchain_period (he, period); + hists->nr_entries++;rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, hists->entries_in);@@ -1227,9 +1234,14 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,struct rb_root *root;struct rb_node *next;struct hist_entry *n; +u64 callchain_total;u64 min_callchain_hits; - min_callchain_hits =hists__total_period (hists) * (callchain_param.min_percent /100 ); + callchain_total = hists->callchain_period; +if (symbol_conf.filter_relative) + callchain_total = hists->callchain_non_filtered_period; + + min_callchain_hits = callchain_total * (callchain_param.min_percent /100 );if (sort__need_collapse) root = &hists->entries_collapsed;tools/perf/util/hist.h +2
-0@@ -66,6 +66,8 @@ struct hists {struct rb_root entries_collapsed;u64 nr_entries;u64 nr_non_filtered_entries; +u64 callchain_period; +u64 callchain_non_filtered_period;struct thread *thread_filter;const struct dso *dso_filter;const char *uid_filter_str;Signature · 1 line
2.7.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v6 01/25] perf hists browser: Fix percentage update on key press
Em Tue, Feb 16, 2016 at 05:06:08PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Tue, Feb 16, 2016 at 11:08:19PM +0900, Namhyung Kim escreveu:
Quoted 9 lines
Currently 'perf top --tui' decrements percentage of all entries on any key press. This is because it adds total period as new samples are added to hists. As perf-top does it currently but added samples are not passed to the display thread, the percentages are decresing continuously.
So separate total period stat into a different variable so that it cannot affect the output total period. This new total period stats are used only for calcualating callchain percent limit.
Quoted 6 lines
I'm trying to figure this out now, but please next time add a line like
Fixes aabbccddeeff ("perf tools: buggy commit description")This helps reviewing as well as to figure out if this needs to go to [email protected], etc.
So this is the one:
[acme@ssdandy linux]$ git bisect good 0f58474ec835f6fc80af2cde2c7ed5495cd212ba is the first bad commit commit 0f58474ec835f6fc80af2cde2c7ed5495cd212ba
Author: Namhyung Kim <[email protected]> Date: Thu Jan 28 00:40:49 2016 +0900
perf hists: Update hists' total period when adding entries
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).
:040000 040000 ff6b15566490dbc26fdd70af5c7ab09451d9bfcd a27ec8e9f21172b1fa3617498976d04a2fcc2449 M tools
[acme@ssdandy linux]$
So we this in this cset:
And it needs to go to [email protected] # v4.4+
[acme@ssdandy linux]$ git describe 0f58474ec835f6fc80af2cde2c7ed5495cd212ba v4.4-5893-g0f58474ec835
Please double check this, I'll be OOO in a moment.
- Arnaldo
Namhyung Kim
maintainerRe: [PATCH v6 01/25] perf hists browser: Fix percentage update on key press
Hi Arnaldo,
Quoted 18 lines · Arnaldo Carvalho de Melo
Em Tue, Feb 16, 2016 at 05:06:08PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 17 lines
Em Tue, Feb 16, 2016 at 11:08:19PM +0900, Namhyung Kim escreveu:
Quoted 9 lines
Currently 'perf top --tui' decrements percentage of all entries on any key press. This is because it adds total period as new samples are added to hists. As perf-top does it currently but added samples are not passed to the display thread, the percentages are decresing continuously.
So separate total period stat into a different variable so that it cannot affect the output total period. This new total period stats are used only for calcualating callchain percent limit.
I'm trying to figure this out now, but please next time add a line like
Fixes aabbccddeeff ("perf tools: buggy commit description")This helps reviewing as well as to figure out if this needs to go to [email protected], etc.
OK.
Quoted 34 lines
So this is the one:
[acme@ssdandy linux]$ git bisect good
0f58474ec835f6fc80af2cde2c7ed5495cd212bais the first bad commit commit0f58474ec835f6fc80af2cde2c7ed5495cd212baAuthor: Namhyung Kim <[email protected]> Date: Thu Jan 28 00:40:49 2016 +0900perf hists: Update hists' total period when adding entries
Currently the hist entry addition path doesn't update
total_periodof 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).
Signed-off-by Namhyung Kim <[email protected]>Cc Andi Kleen <[email protected]>Cc David Ahern <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc Jiri Olsa <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Wang Nan <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>:040000 040000
ff6b15566490dbc26fdd70af5c7ab09451d9bfcda27ec8e9f21172b1fa3617498976d04a2fcc2449M tools
[acme@ssdandy linux]$So we this in this cset:
Quoted 8 lines
Fixes 0f58474ec835 ("perf hists: Update hists' total period when adding entries")And it needs to go to [email protected] # v4.4+
[acme@ssdandy linux]$ git describe
0f58474ec835f6fc80af2cde2c7ed5495cd212bav4.4-5893-g0f58474ec835Please double check this, I'll be OOO in a moment.
I think it's not needed to CC the stable this time. AFAIK this patch didn't go to the mainline yet. It's only in the tip tree.
I think you need to use git name-rev instead of git describe.
$ git name-rev --tags 0f58474ec835f6fc80af2cde2c7ed5495cd212ba 0f58474ec835f6fc80af2cde2c7ed5495cd212ba undefined
$ git branch -r --contains 0f58474ec835f6fc80af2cde2c7ed5495cd212ba acme/perf/core
$ git tag --contains 0f58474ec835f6fc80af2cde2c7ed5495cd212ba (nothing)
$ git remote -v acme git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git (fetch) acme git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git (push) origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (fetch) origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (push) ...
Thanks,
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v6 01/25] perf hists browser: Fix percentage update on key press
Em Wed, Feb 17, 2016 at 08:39:08AM +0900, Namhyung Kim escreveu:
Quoted 10 lines · Arnaldo Carvalho de Melo
Quoted 8 lines
So we this in this cset:
Fixes 0f58474ec835 ("perf hists: Update hists' total period when adding entries")And it needs to go to [email protected] # v4.4+
[acme@ssdandy linux]$ git describe
0f58474ec835f6fc80af2cde2c7ed5495cd212bav4.4-5893-g0f58474ec835
Quoted 6 lines
Quoted 1 line
Please double check this, I'll be OOO in a moment.
I think it's not needed to CC the stable this time. AFAIK this patch didn't go to the mainline yet. It's only in the tip tree.
I think you need to use git name-rev instead of git describe.
Thanks for double checking it and pointing me to 'git name-rev' and 'branch/tag --contains', I'll be using those commands from now on, probably will add it to my 'fixes' script to add the relevant 'Cc:
[email protected] # v4.x+' line :-)
- Arnaldo
Quoted 19 lines
$ git name-rev --tags 0f58474ec835f6fc80af2cde2c7ed5495cd212ba 0f58474ec835f6fc80af2cde2c7ed5495cd212ba undefined$ git branch -r --contains 0f58474ec835f6fc80af2cde2c7ed5495cd212ba acme/perf/core$ git tag --contains 0f58474ec835f6fc80af2cde2c7ed5495cd212ba (nothing)$ git remote -v acme git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git (fetch) acme git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git (push) origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (fetch) origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (push) ...Thanks,
Namhyung
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf hists browser: Fix percentage update on key press
In reply to Namhyung Kimperf hists browser: Fix percentage update on key press
Commit-ID: 467ef10c68b90b940412390dcd14bbfe8cc40e73 Gitweb: http://git.kernel.org/tip/467ef10c68b90b940412390dcd14bbfe8cc40e73 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:19 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:12:51 -0300
perf hists browser: Fix percentage update on key press
Currently 'perf top --tui' decrements percentage of all entries on any key press. This is because it adds total period as new samples are added to hists. As perf-top does it currently but added samples are not passed to the display thread, the percentages are decresing continuously.
So separate total period stat into a different variable so that it cannot affect the output total period. This new total period stats are used only for calcualating callchain percent limit.
--- tools/perf/util/hist.c | 26 +++++++++++++++++++------- tools/perf/util/hist.h | 2 ++ 2 files changed, 21 insertions(+), 7 deletions(-)
tools/perf/util/hist.c +19 -7
@@ -405,6 +405,16 @@ static u8 symbol__parent_filter(const struct symbol *parent)return 0 ; } +static void hist_entry__add_callchain_period (struct hist_entry *he,u64 period) +{ +if (!symbol_conf.use_callchain) +return ; + + he->hists->callchain_period += period; +if (!he->filtered) + he->hists->callchain_non_filtered_period += period; +} + static struct hist_entry *hists__findnew_entry(struct hists *hists, struct hist_entry *entry, struct addr_location *al,
@@ -434,9 +444,7 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,if (!cmp) {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; +hist_entry__add_callchain_period (he, period); }if (symbol_conf.cumulate_callchain)he_stat__add_period (he->stat_acc, period, weight);
@@ -471,9 +479,8 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,return NULL ;if (sample_self) -hists__inc_stats (hists, he); -else - hists->nr_entries++; +hist_entry__add_callchain_period (he, period); + hists->nr_entries++;rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, hists->entries_in);
@@ -1227,9 +1234,14 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,struct rb_root *root;struct rb_node *next;struct hist_entry *n; +u64 callchain_total;u64 min_callchain_hits; - min_callchain_hits =hists__total_period (hists) * (callchain_param.min_percent /100 ); + callchain_total = hists->callchain_period; +if (symbol_conf.filter_relative) + callchain_total = hists->callchain_non_filtered_period; + + min_callchain_hits = callchain_total * (callchain_param.min_percent /100 );if (sort__need_collapse) root = &hists->entries_collapsed;
tools/perf/util/hist.h +2 -0
@@ -66,6 +66,8 @@ struct hists {struct rb_root entries_collapsed;u64 nr_entries;u64 nr_non_filtered_entries; +u64 callchain_period; +u64 callchain_non_filtered_period;struct thread *thread_filter;const struct dso *dso_filter;const char *uid_filter_str;
Namhyung Kim
maintainerPATCH v6 2/25 perf callchain: Check return value of add_child()
In reply to Namhyung KimThe create_child() in add_child() can return NULL in case of memory allocation failure. So check the return value and bail out. The proper error handling will be added later.
--- tools/perf/util/callchain.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/callchain.c +8 -0
@@ -453,6 +453,9 @@ add_child(struct callchain_node *parent,struct callchain_node *new; new =create_child (parent, false); +if (new ==NULL ) +return NULL ; +fill_node (new, cursor); new->children_hit =0 ;
@@ -524,6 +527,8 @@ split_add_child(struct callchain_node *parent, node =callchain_cursor_current (cursor); new =add_child (parent, cursor, period); +if (new ==NULL ) +return ;/* * This is second child since we moved parent's children
@@ -585,6 +590,9 @@ append_chain_children(struct callchain_node *root, }/* nothing in children, add to the current node */ rnode =add_child (root, cursor, period); +if (rnode ==NULL ) +return ; +rb_link_node (&rnode->rb_node_in, parent, p);rb_insert_color (&rnode->rb_node_in, &root->rb_root_in);
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf callchain: Check return value of add_child()
perf callchain: Check return value of add_child()
Commit-ID: 7565bd39c1a63c82350d26a66ea1a1f1bb49ad2e Gitweb: http://git.kernel.org/tip/7565bd39c1a63c82350d26a66ea1a1f1bb49ad2e Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:20 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:12:52 -0300
perf callchain: Check return value of add_child()
The create_child() in add_child() can return NULL in case of memory allocation failure. So check the return value and bail out. The proper error handling will be added later.
--- tools/perf/util/callchain.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/callchain.c +8 -0
@@ -453,6 +453,9 @@ add_child(struct callchain_node *parent,struct callchain_node *new; new =create_child (parent, false); +if (new ==NULL ) +return NULL ; +fill_node (new, cursor); new->children_hit =0 ;
@@ -524,6 +527,8 @@ split_add_child(struct callchain_node *parent, node =callchain_cursor_current (cursor); new =add_child (parent, cursor, period); +if (new ==NULL ) +return ;/* * This is second child since we moved parent's children
@@ -585,6 +590,9 @@ append_chain_children(struct callchain_node *root, }/* nothing in children, add to the current node */ rnode =add_child (root, cursor, period); +if (rnode ==NULL ) +return ; +rb_link_node (&rnode->rb_node_in, parent, p);rb_insert_color (&rnode->rb_node_in, &root->rb_root_in);
Namhyung Kim
maintainerPATCH v6 3/25 perf callchain: Check return value of fill_node()
In reply to Namhyung KimMemory allocation in the fill_node() can fail so change its return type to int and check it in add_child() too.
--- tools/perf/util/callchain.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +13 -3
@@ -416,7 +416,7 @@ create_child(struct callchain_node *parent, bool inherit_children)/* * Fill the node with callchain values */ -static void +static int fill_node (struct callchain_node *node,struct callchain_cursor *cursor) {struct callchain_cursor_node *cursor_node;
@@ -433,7 +433,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor) call =zalloc (sizeof (*call));if (!call) {perror ("not enough memory for the code path tree" ); -return ; +return -1 ; } call->ip = cursor_node->ip; call->ms.sym = cursor_node->sym;
@@ -443,6 +443,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor)callchain_cursor_advance (cursor); cursor_node =callchain_cursor_current (cursor); } +return 0 ; } static struct callchain_node *
@@ -456,7 +457,16 @@ add_child(struct callchain_node *parent,if (new ==NULL )return NULL ; -fill_node (new, cursor); +if (fill_node (new, cursor) <0 ) { +struct callchain_list *call, *tmp; + +list_for_each_entry_safe (call, tmp, &new->val, list) { +list_del (&call->list); +free (call); + } +free (new); +return NULL ; + } new->children_hit =0 ; new->hit = period;
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf callchain: Check return value of fill_node()
perf callchain: Check return value of fill_node()
Commit-ID: 8451cbb9b174a9b6e016d7f1bff81ff12dbd1990 Gitweb: http://git.kernel.org/tip/8451cbb9b174a9b6e016d7f1bff81ff12dbd1990 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:21 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:13:21 -0300
perf callchain: Check return value of fill_node()
Memory allocation in the fill_node() can fail so change its return type to int and check it in add_child() too.
--- tools/perf/util/callchain.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +13 -3
@@ -416,7 +416,7 @@ create_child(struct callchain_node *parent, bool inherit_children)/* * Fill the node with callchain values */ -static void +static int fill_node (struct callchain_node *node,struct callchain_cursor *cursor) {struct callchain_cursor_node *cursor_node;
@@ -433,7 +433,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor) call =zalloc (sizeof (*call));if (!call) {perror ("not enough memory for the code path tree" ); -return ; +return -1 ; } call->ip = cursor_node->ip; call->ms.sym = cursor_node->sym;
@@ -443,6 +443,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor)callchain_cursor_advance (cursor); cursor_node =callchain_cursor_current (cursor); } +return 0 ; } static struct callchain_node *
@@ -456,7 +457,16 @@ add_child(struct callchain_node *parent,if (new ==NULL )return NULL ; -fill_node (new, cursor); +if (fill_node (new, cursor) <0 ) { +struct callchain_list *call, *tmp; + +list_for_each_entry_safe (call, tmp, &new->val, list) { +list_del (&call->list); +free (call); + } +free (new); +return NULL ; + } new->children_hit =0 ; new->hit = period;
Namhyung Kim
maintainerPATCH v6 4/25 perf callchain: Add enum match_result for match_chain()
In reply to Namhyung KimThe append_chain() might return either result of match_chain() or other (error) code. But match_chain() can return any value in s64 type so it's hard to check the error case. Add new enum match_result and make match_chain() return non-negative values only so that we can check the error cases.
--- tools/perf/util/callchain.c | 52 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-)
tools/perf/util/callchain.c +34 -18
@@ -475,16 +475,32 @@ add_child(struct callchain_node *parent,return new; } -static s64 match_chain (struct callchain_cursor_node *node, -struct callchain_list *cnode) +enum match_result { +MATCH_ERROR =-1 , +MATCH_EQ , +MATCH_LT , +MATCH_GT , +}; + +static enum match_result match_chain (struct callchain_cursor_node *node, +struct callchain_list *cnode) {struct symbol *sym = node->sym; +u64 left, right;if (cnode->ms.sym && sym && - callchain_param.key ==CCKEY_FUNCTION ) -return cnode->ms.sym->start - sym->start; -else -return cnode->ip - node->ip; + callchain_param.key ==CCKEY_FUNCTION ) { + left = cnode->ms.sym->start; + right = sym->start; + }else { + left = cnode->ip; + right = node->ip; + } + +if (left == right) +return MATCH_EQ ; + +return left > right ?MATCH_GT :MATCH_LT ; }/*
@@ -549,7 +565,7 @@ split_add_child(struct callchain_node *parent, cnode = list_first_entry(&first->val, struct callchain_list, list); -if (match_chain (node, cnode) <0 ) +if (match_chain (node, cnode) ==MATCH_LT ) pp = &p->rb_left;else pp = &p->rb_right;
@@ -562,7 +578,7 @@ split_add_child(struct callchain_node *parent, } } -static int +static enum match_result append_chain (struct callchain_node *root,struct callchain_cursor *cursor,u64 period);
@@ -583,17 +599,17 @@ append_chain_children(struct callchain_node *root,/* lookup in childrens */ while (*p) { -s64 ret; +enum match_result ret; parent = *p; rnode = rb_entry(parent, struct callchain_node, rb_node_in);/* If at least first entry matches, rely to children */ ret =append_chain (rnode, cursor, period); -if (ret ==0 ) +if (ret ==MATCH_EQ ) goto inc_children_hit; -if (ret <0 ) +if (ret ==MATCH_LT ) p = &parent->rb_left;else p = &parent->rb_right;
@@ -611,7 +627,7 @@ inc_children_hit: root->children_count++; } -static int +static enum match_result append_chain (struct callchain_node *root,struct callchain_cursor *cursor,u64 period)
@@ -620,7 +636,7 @@ append_chain(struct callchain_node *root,u64 start = cursor->pos;bool found = false;u64 matches; -int cmp =0 ; +enum match_result cmp =MATCH_ERROR ;/* * Lookup in the current node
@@ -636,7 +652,7 @@ append_chain(struct callchain_node *root,break ; cmp =match_chain (node, cnode); -if (cmp) +if (cmp !=MATCH_EQ )break ; found = true;
@@ -646,7 +662,7 @@ append_chain(struct callchain_node *root,/* matches not, relay no the parent */ if (!found) { -WARN_ONCE (!cmp,"Chain comparison error\n" ); +WARN_ONCE (cmp ==MATCH_ERROR ,"Chain comparison error\n" );return cmp; }
@@ -655,20 +671,20 @@ append_chain(struct callchain_node *root,/* we match only a part of the node. Split it and add the new chain */ if (matches < root->val_nr) {split_add_child (root, cursor, cnode, start, matches, period); -return 0 ; +return MATCH_EQ ; }/* we match 100% of the path, increment the hit */ if (matches == root->val_nr && cursor->pos == cursor->nr) { root->hit += period; root->count++; -return 0 ; +return MATCH_EQ ; }/* We match the node and still have a part remaining */ append_chain_children (root, cursor, period); -return 0 ; +return MATCH_EQ ; } int callchain_append(struct callchain_root *root,
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf callchain: Add enum match_result for match_chain()
perf callchain: Add enum match_result for match_chain()
Commit-ID: 2d713b809d89a3d10c6a85162bf7cce0468e45d9 Gitweb: http://git.kernel.org/tip/2d713b809d89a3d10c6a85162bf7cce0468e45d9 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:22 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:14:20 -0300
perf callchain: Add enum match_result for match_chain()
The append_chain() might return either result of match_chain() or other (error) code. But match_chain() can return any value in s64 type so it's hard to check the error case. Add new enum match_result and make match_chain() return non-negative values only so that we can check the error cases.
--- tools/perf/util/callchain.c | 52 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-)
tools/perf/util/callchain.c +34 -18
@@ -475,16 +475,32 @@ add_child(struct callchain_node *parent,return new; } -static s64 match_chain (struct callchain_cursor_node *node, -struct callchain_list *cnode) +enum match_result { +MATCH_ERROR =-1 , +MATCH_EQ , +MATCH_LT , +MATCH_GT , +}; + +static enum match_result match_chain (struct callchain_cursor_node *node, +struct callchain_list *cnode) {struct symbol *sym = node->sym; +u64 left, right;if (cnode->ms.sym && sym && - callchain_param.key ==CCKEY_FUNCTION ) -return cnode->ms.sym->start - sym->start; -else -return cnode->ip - node->ip; + callchain_param.key ==CCKEY_FUNCTION ) { + left = cnode->ms.sym->start; + right = sym->start; + }else { + left = cnode->ip; + right = node->ip; + } + +if (left == right) +return MATCH_EQ ; + +return left > right ?MATCH_GT :MATCH_LT ; }/*
@@ -549,7 +565,7 @@ split_add_child(struct callchain_node *parent, cnode = list_first_entry(&first->val, struct callchain_list, list); -if (match_chain (node, cnode) <0 ) +if (match_chain (node, cnode) ==MATCH_LT ) pp = &p->rb_left;else pp = &p->rb_right;
@@ -562,7 +578,7 @@ split_add_child(struct callchain_node *parent, } } -static int +static enum match_result append_chain (struct callchain_node *root,struct callchain_cursor *cursor,u64 period);
@@ -583,17 +599,17 @@ append_chain_children(struct callchain_node *root,/* lookup in childrens */ while (*p) { -s64 ret; +enum match_result ret; parent = *p; rnode = rb_entry(parent, struct callchain_node, rb_node_in);/* If at least first entry matches, rely to children */ ret =append_chain (rnode, cursor, period); -if (ret ==0 ) +if (ret ==MATCH_EQ ) goto inc_children_hit; -if (ret <0 ) +if (ret ==MATCH_LT ) p = &parent->rb_left;else p = &parent->rb_right;
@@ -611,7 +627,7 @@ inc_children_hit: root->children_count++; } -static int +static enum match_result append_chain (struct callchain_node *root,struct callchain_cursor *cursor,u64 period)
@@ -620,7 +636,7 @@ append_chain(struct callchain_node *root,u64 start = cursor->pos;bool found = false;u64 matches; -int cmp =0 ; +enum match_result cmp =MATCH_ERROR ;/* * Lookup in the current node
@@ -636,7 +652,7 @@ append_chain(struct callchain_node *root,break ; cmp =match_chain (node, cnode); -if (cmp) +if (cmp !=MATCH_EQ )break ; found = true;
@@ -646,7 +662,7 @@ append_chain(struct callchain_node *root,/* matches not, relay no the parent */ if (!found) { -WARN_ONCE (!cmp,"Chain comparison error\n" ); +WARN_ONCE (cmp ==MATCH_ERROR ,"Chain comparison error\n" );return cmp; }
@@ -655,20 +671,20 @@ append_chain(struct callchain_node *root,/* we match only a part of the node. Split it and add the new chain */ if (matches < root->val_nr) {split_add_child (root, cursor, cnode, start, matches, period); -return 0 ; +return MATCH_EQ ; }/* we match 100% of the path, increment the hit */ if (matches == root->val_nr && cursor->pos == cursor->nr) { root->hit += period; root->count++; -return 0 ; +return MATCH_EQ ; }/* We match the node and still have a part remaining */ append_chain_children (root, cursor, period); -return 0 ; +return MATCH_EQ ; } int callchain_append(struct callchain_root *root,
Namhyung Kim
maintainerPATCH v6 5/25 perf callchain: Check return value of split_add_child()
In reply to Namhyung KimNow create_child() and add_child() return errors so check and pass it to the caller.
--- tools/perf/util/callchain.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +9 -3
@@ -508,7 +508,7 @@ static enum match_result match_chain(struct callchain_cursor_node *node,* give a part of its callchain to the created child. * Then create another child to host the given callchain of new branch */ -static void +static int split_add_child(struct callchain_node *parent, struct callchain_cursor *cursor, struct callchain_list *to_split,
@@ -520,6 +520,8 @@ split_add_child(struct callchain_node *parent,/* split */ new =create_child (parent, true); +if (new ==NULL ) +return -1 ;/* split the callchain and move a part to the new child */ old_tail = parent->val.prev;
@@ -554,7 +556,7 @@ split_add_child(struct callchain_node *parent, node =callchain_cursor_current (cursor); new =add_child (parent, cursor, period);if (new ==NULL ) -return ; +return -1 ;/* * This is second child since we moved parent's children
@@ -576,6 +578,7 @@ split_add_child(struct callchain_node *parent, parent->hit = period; parent->count =1 ; } +return 0 ; } static enum match_result
@@ -670,7 +673,10 @@ append_chain(struct callchain_node *root,/* we match only a part of the node. Split it and add the new chain */ if (matches < root->val_nr) { -split_add_child (root, cursor, cnode, start, matches, period); +if (split_add_child (root, cursor, cnode, start, matches, + period) <0 ) +return MATCH_ERROR ; +return MATCH_EQ ; }
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf callchain: Check return value of split_add_child()
perf callchain: Check return value of split_add_child()
Commit-ID: f2bb4c5af4fe16d8b1e4ae371e1ceaa817380a88 Gitweb: http://git.kernel.org/tip/f2bb4c5af4fe16d8b1e4ae371e1ceaa817380a88 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:23 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:14:36 -0300
perf callchain: Check return value of split_add_child()
Now create_child() and add_child() return errors so check and pass it to the caller.
--- tools/perf/util/callchain.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +9 -3
@@ -508,7 +508,7 @@ static enum match_result match_chain(struct callchain_cursor_node *node,* give a part of its callchain to the created child. * Then create another child to host the given callchain of new branch */ -static void +static int split_add_child(struct callchain_node *parent, struct callchain_cursor *cursor, struct callchain_list *to_split,
@@ -520,6 +520,8 @@ split_add_child(struct callchain_node *parent,/* split */ new =create_child (parent, true); +if (new ==NULL ) +return -1 ;/* split the callchain and move a part to the new child */ old_tail = parent->val.prev;
@@ -554,7 +556,7 @@ split_add_child(struct callchain_node *parent, node =callchain_cursor_current (cursor); new =add_child (parent, cursor, period);if (new ==NULL ) -return ; +return -1 ;/* * This is second child since we moved parent's children
@@ -576,6 +578,7 @@ split_add_child(struct callchain_node *parent, parent->hit = period; parent->count =1 ; } +return 0 ; } static enum match_result
@@ -670,7 +673,10 @@ append_chain(struct callchain_node *root,/* we match only a part of the node. Split it and add the new chain */ if (matches < root->val_nr) { -split_add_child (root, cursor, cnode, start, matches, period); +if (split_add_child (root, cursor, cnode, start, matches, + period) <0 ) +return MATCH_ERROR ; +return MATCH_EQ ; }
Namhyung Kim
maintainerPATCH v6 6/25 perf callchain: Check return value of append_chain_children()
In reply to Namhyung KimNow it can check the error case, so check and pass it to the caller.
--- tools/perf/util/callchain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
tools/perf/util/callchain.c +12 -6
@@ -586,7 +586,7 @@ append_chain(struct callchain_node *root,struct callchain_cursor *cursor, u64 period); -static void +static int append_chain_children (struct callchain_node *root,struct callchain_cursor *cursor,u64 period)
@@ -598,7 +598,7 @@ append_chain_children(struct callchain_node *root, node =callchain_cursor_current (cursor);if (!node) -return ; +return -1 ;/* lookup in childrens */ while (*p) {
@@ -611,6 +611,8 @@ append_chain_children(struct callchain_node *root, ret =append_chain (rnode, cursor, period);if (ret ==MATCH_EQ ) goto inc_children_hit; +if (ret ==MATCH_ERROR ) +return -1 ;if (ret ==MATCH_LT ) p = &parent->rb_left;
@@ -620,7 +622,7 @@ append_chain_children(struct callchain_node *root,/* nothing in children, add to the current node */ rnode =add_child (root, cursor, period);if (rnode ==NULL ) -return ; +return -1 ;rb_link_node (&rnode->rb_node_in, parent, p);rb_insert_color (&rnode->rb_node_in, &root->rb_root_in);
@@ -628,6 +630,7 @@ append_chain_children(struct callchain_node *root, inc_children_hit: root->children_hit += period; root->children_count++; +return 0 ; } static enum match_result
@@ -688,7 +691,8 @@ append_chain(struct callchain_node *root, }/* We match the node and still have a part remaining */ -append_chain_children (root, cursor, period); +if (append_chain_children (root, cursor, period) <0 ) +return MATCH_ERROR ;return MATCH_EQ ; }
@@ -702,7 +706,8 @@ int callchain_append(struct callchain_root *root,callchain_cursor_commit (cursor); -append_chain_children (&root->node, cursor, period); +if (append_chain_children (&root->node, cursor, period) <0 ) +return -1 ;if (cursor->nr > root->max_depth) root->max_depth = cursor->nr;
@@ -730,7 +735,8 @@ merge_chain_branch(struct callchain_cursor *cursor,if (src->hit) {callchain_cursor_commit (cursor); -append_chain_children (dst, cursor, src->hit); +if (append_chain_children (dst, cursor, src->hit) <0 ) +return -1 ; } n =rb_first (&src->rb_root_in);
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf callchain: Check return value of append_chain_children()
perf callchain: Check return value of append_chain_children()
Commit-ID: dca0d122e498c054b117bd4aa5568ce90ee142d5 Gitweb: http://git.kernel.org/tip/dca0d122e498c054b117bd4aa5568ce90ee142d5 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:24 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:15:01 -0300
perf callchain: Check return value of append_chain_children()
Now it can check the error case, so check and pass it to the caller.
--- tools/perf/util/callchain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
tools/perf/util/callchain.c +12 -6
@@ -586,7 +586,7 @@ append_chain(struct callchain_node *root,struct callchain_cursor *cursor, u64 period); -static void +static int append_chain_children (struct callchain_node *root,struct callchain_cursor *cursor,u64 period)
@@ -598,7 +598,7 @@ append_chain_children(struct callchain_node *root, node =callchain_cursor_current (cursor);if (!node) -return ; +return -1 ;/* lookup in childrens */ while (*p) {
@@ -611,6 +611,8 @@ append_chain_children(struct callchain_node *root, ret =append_chain (rnode, cursor, period);if (ret ==MATCH_EQ ) goto inc_children_hit; +if (ret ==MATCH_ERROR ) +return -1 ;if (ret ==MATCH_LT ) p = &parent->rb_left;
@@ -620,7 +622,7 @@ append_chain_children(struct callchain_node *root,/* nothing in children, add to the current node */ rnode =add_child (root, cursor, period);if (rnode ==NULL ) -return ; +return -1 ;rb_link_node (&rnode->rb_node_in, parent, p);rb_insert_color (&rnode->rb_node_in, &root->rb_root_in);
@@ -628,6 +630,7 @@ append_chain_children(struct callchain_node *root, inc_children_hit: root->children_hit += period; root->children_count++; +return 0 ; } static enum match_result
@@ -688,7 +691,8 @@ append_chain(struct callchain_node *root, }/* We match the node and still have a part remaining */ -append_chain_children (root, cursor, period); +if (append_chain_children (root, cursor, period) <0 ) +return MATCH_ERROR ;return MATCH_EQ ; }
@@ -702,7 +706,8 @@ int callchain_append(struct callchain_root *root,callchain_cursor_commit (cursor); -append_chain_children (&root->node, cursor, period); +if (append_chain_children (&root->node, cursor, period) <0 ) +return -1 ;if (cursor->nr > root->max_depth) root->max_depth = cursor->nr;
@@ -730,7 +735,8 @@ merge_chain_branch(struct callchain_cursor *cursor,if (src->hit) {callchain_cursor_commit (cursor); -append_chain_children (dst, cursor, src->hit); +if (append_chain_children (dst, cursor, src->hit) <0 ) +return -1 ; } n =rb_first (&src->rb_root_in);
Namhyung Kim
maintainerPATCH v6 7/25 perf hists: Return error from hists__collapse_resort()
In reply to Namhyung KimCurrently hists__collapse_resort() and hists__collapse_insert_entry() don't return error code. Now callchain_merge() can check error case, abort and pass the error to the user. Later patch can add more work which can be failed too.
--- tools/perf/util/hist.c | 29 +++++++++++++++++++---------- tools/perf/util/hist.h | 4 ++-- 2 files changed, 21 insertions(+), 12 deletions(-)
tools/perf/util/hist.c +19 -10
@@ -1046,8 +1046,8 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp,* collapse the histogram */ -bool hists__collapse_insert_entry (struct hists *hists__maybe_unused , -struct rb_root *root,struct hist_entry *he) +int hists__collapse_insert_entry (struct hists *hists,struct rb_root *root, +struct hist_entry *he) {struct rb_node **p = &root->rb_node;struct rb_node *parent =NULL ;
@@ -1061,18 +1061,21 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, cmp =hist_entry__collapse (iter, he);if (!cmp) { +int ret =0 ; +he_stat__add_stat (&iter->stat, &he->stat);if (symbol_conf.cumulate_callchain)he_stat__add_stat (iter->stat_acc, he->stat_acc);if (symbol_conf.use_callchain) {callchain_cursor_reset (&callchain_cursor); -callchain_merge (&callchain_cursor, - iter->callchain, - he->callchain); +if (callchain_merge (&callchain_cursor, + iter->callchain, + he->callchain) <0 ) + ret =-1 ; }hist_entry__delete (he); -return false; +return ret; }if (cmp <0 )
@@ -1084,7 +1087,7 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, root); -return true; +return 1 ; }struct rb_root *hists__get_rotate_entries_in (struct hists *hists)
@@ -1110,14 +1113,15 @@ static void hists__apply_filters(struct hists *hists, struct hist_entry *he)hists__filter_entry_by_socket (hists, he); } -void hists__collapse_resort (struct hists *hists,struct ui_progress *prog) +int hists__collapse_resort (struct hists *hists,struct ui_progress *prog) {struct rb_root *root;struct rb_node *next;struct hist_entry *n; +int ret;if (!sort__need_collapse) -return ; +return 0 ; hists->nr_entries =0 ;
@@ -1132,7 +1136,11 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog) next =rb_next (&n->rb_node_in);rb_erase (&n->rb_node_in, root); -if (hists__collapse_insert_entry (hists, &hists->entries_collapsed, n)) { + ret =hists__collapse_insert_entry (hists, &hists->entries_collapsed, n); +if (ret <0 ) +return -1 ; + +if (ret) {/* * If it wasn't combined with one of the entries already * collapsed, we need to apply the filters that may have
@@ -1143,6 +1151,7 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog)if (prog)ui_progress__update (prog,1 ); } +return 0 ; }static int hist_entry__sort (struct hist_entry *a,struct hist_entry *b)
tools/perf/util/hist.h +2 -2
@@ -138,7 +138,7 @@ void hist_entry__delete(struct hist_entry *he);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog); -void hists__collapse_resort (struct hists *hists,struct ui_progress *prog); +int 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__delete_entries (struct hists *hists);
@@ -197,7 +197,7 @@ int hists__init(void);int __hists__init (struct hists *hists,struct perf_hpp_list *hpp_list);struct rb_root *hists__get_rotate_entries_in (struct hists *hists); -bool hists__collapse_insert_entry (struct hists *hists__maybe_unused , +int hists__collapse_insert_entry (struct hists *hists,struct rb_root *root,struct hist_entry *he);struct perf_hpp {
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf hists: Return error from hists__collapse_resort()
perf hists: Return error from hists__collapse_resort()
Commit-ID: bba58cdfaace2eb96d2b3cabc610d2ba033371c8 Gitweb: http://git.kernel.org/tip/bba58cdfaace2eb96d2b3cabc610d2ba033371c8 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:25 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:16:06 -0300
perf hists: Return error from hists__collapse_resort()
Currently hists__collapse_resort() and hists__collapse_insert_entry() don't return an error code. Now that callchain_merge() can check for errors, abort and pass the error to the user. A later patch can add more work which also can fail.
--- tools/perf/util/hist.c | 29 +++++++++++++++++++---------- tools/perf/util/hist.h | 4 ++-- 2 files changed, 21 insertions(+), 12 deletions(-)
tools/perf/util/hist.c +19 -10
@@ -1046,8 +1046,8 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp,* collapse the histogram */ -bool hists__collapse_insert_entry (struct hists *hists__maybe_unused , -struct rb_root *root,struct hist_entry *he) +int hists__collapse_insert_entry (struct hists *hists,struct rb_root *root, +struct hist_entry *he) {struct rb_node **p = &root->rb_node;struct rb_node *parent =NULL ;
@@ -1061,18 +1061,21 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, cmp =hist_entry__collapse (iter, he);if (!cmp) { +int ret =0 ; +he_stat__add_stat (&iter->stat, &he->stat);if (symbol_conf.cumulate_callchain)he_stat__add_stat (iter->stat_acc, he->stat_acc);if (symbol_conf.use_callchain) {callchain_cursor_reset (&callchain_cursor); -callchain_merge (&callchain_cursor, - iter->callchain, - he->callchain); +if (callchain_merge (&callchain_cursor, + iter->callchain, + he->callchain) <0 ) + ret =-1 ; }hist_entry__delete (he); -return false; +return ret; }if (cmp <0 )
@@ -1084,7 +1087,7 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, root); -return true; +return 1 ; }struct rb_root *hists__get_rotate_entries_in (struct hists *hists)
@@ -1110,14 +1113,15 @@ static void hists__apply_filters(struct hists *hists, struct hist_entry *he)hists__filter_entry_by_socket (hists, he); } -void hists__collapse_resort (struct hists *hists,struct ui_progress *prog) +int hists__collapse_resort (struct hists *hists,struct ui_progress *prog) {struct rb_root *root;struct rb_node *next;struct hist_entry *n; +int ret;if (!sort__need_collapse) -return ; +return 0 ; hists->nr_entries =0 ;
@@ -1132,7 +1136,11 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog) next =rb_next (&n->rb_node_in);rb_erase (&n->rb_node_in, root); -if (hists__collapse_insert_entry (hists, &hists->entries_collapsed, n)) { + ret =hists__collapse_insert_entry (hists, &hists->entries_collapsed, n); +if (ret <0 ) +return -1 ; + +if (ret) {/* * If it wasn't combined with one of the entries already * collapsed, we need to apply the filters that may have
@@ -1143,6 +1151,7 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog)if (prog)ui_progress__update (prog,1 ); } +return 0 ; }static int hist_entry__sort (struct hist_entry *a,struct hist_entry *b)
tools/perf/util/hist.h +2 -2
@@ -138,7 +138,7 @@ void hist_entry__delete(struct hist_entry *he);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog); -void hists__collapse_resort (struct hists *hists,struct ui_progress *prog); +int 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__delete_entries (struct hists *hists);
@@ -197,7 +197,7 @@ int hists__init(void);int __hists__init (struct hists *hists,struct perf_hpp_list *hpp_list);struct rb_root *hists__get_rotate_entries_in (struct hists *hists); -bool hists__collapse_insert_entry (struct hists *hists__maybe_unused , +int hists__collapse_insert_entry (struct hists *hists,struct rb_root *root,struct hist_entry *he);struct perf_hpp {
Namhyung Kim
maintainerPATCH v6 8/25 perf report: Check error during report__collapse_hists()
In reply to Namhyung KimIf it returns an error, warn user and bail out instead of silently ignoring.
--- tools/perf/builtin-report.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +11 -3
@@ -469,10 +469,11 @@ static int report__browse_hists(struct report *rep)return ret; } -static void report__collapse_hists (struct report *rep) +static int report__collapse_hists (struct report *rep) {struct ui_progress prog;struct perf_evsel *pos; +int ret =0 ;ui_progress__init (&prog, rep->nr_entries,"Merging related events..." );
@@ -484,7 +485,9 @@ static void report__collapse_hists(struct report *rep) hists->socket_filter = rep->socket_filter; -hists__collapse_resort (hists, &prog); + ret =hists__collapse_resort (hists, &prog); +if (ret <0 ) +break ;/* Non-group events are considered as leader */ if (symbol_conf.event_group &&
@@ -497,6 +500,7 @@ static void report__collapse_hists(struct report *rep) }ui_progress__finish (); +return ret; }static void report__output_resort (struct report *rep)
@@ -564,7 +568,11 @@ static int __cmd_report(struct report *rep) } } -report__collapse_hists (rep); + ret =report__collapse_hists (rep); +if (ret) { +ui__error ("failed to process hist entry\n" ); +return ret; + }if (session_done ())return 0 ;
Signature · 1 line
2.7.1
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf report: Check error during report__collapse_hists()
perf report: Check error during report__collapse_hists()
Commit-ID: 5b2ea6f2f6ac81a230e6cc68e1473e796a583f00 Gitweb: http://git.kernel.org/tip/5b2ea6f2f6ac81a230e6cc68e1473e796a583f00 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 16 Feb 2016 23:08:26 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Feb 2016 19:17:50 -0300
perf report: Check error during report__collapse_hists()
If it returns an error, warn user and bail out instead of silently ignoring it.
--- tools/perf/builtin-report.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +11 -3
@@ -469,10 +469,11 @@ static int report__browse_hists(struct report *rep)return ret; } -static void report__collapse_hists (struct report *rep) +static int report__collapse_hists (struct report *rep) {struct ui_progress prog;struct perf_evsel *pos; +int ret =0 ;ui_progress__init (&prog, rep->nr_entries,"Merging related events..." );
@@ -484,7 +485,9 @@ static void report__collapse_hists(struct report *rep) hists->socket_filter = rep->socket_filter; -hists__collapse_resort (hists, &prog); + ret =hists__collapse_resort (hists, &prog); +if (ret <0 ) +break ;/* Non-group events are considered as leader */ if (symbol_conf.event_group &&
@@ -497,6 +500,7 @@ static void report__collapse_hists(struct report *rep) }ui_progress__finish (); +return ret; }static void report__output_resort (struct report *rep)
@@ -564,7 +568,11 @@ static int __cmd_report(struct report *rep) } } -report__collapse_hists (rep); + ret =report__collapse_hists (rep); +if (ret) { +ui__error ("failed to process hist entry\n" ); +return ret; + }if (session_done ())return 0 ;
Namhyung Kim
maintainerPATCH v6 9/25 perf hists: Basic support of hierarchical report view
In reply to Namhyung KimIn the hierarchical view, entries will be grouped and sorted on the first key, and then second key, and so on. Add he->hroot_{in,out} field to keep lower level entries. Actually this can be shared with callchain sorted_root since the hroots are only used by non-leaf entries and callchain is only used by leaf entries.
It also adds parent_he and depth fields which can be used by browsers.
This patch only implements collapsing part which creates internal entries for each sort key. These need to be sorted by output_sort stage and to be displayed properly in the later patch(es).
--- tools/perf/util/hist.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/sort.h | 13 ++++++- tools/perf/util/symbol.h | 3 +- 3 files changed, 111 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +97 -0
@@ -1046,6 +1046,99 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp,* collapse the histogram */ +static void hists__apply_filters (struct hists *hists,struct hist_entry *he); + +static struct hist_entry *hierarchy_insert_entry (struct hists *hists, +struct rb_root *root, +struct hist_entry *he, +struct perf_hpp_fmt *fmt) +{ +struct rb_node **p = &root->rb_node; +struct rb_node *parent =NULL ; +struct hist_entry *iter, *new; +int64_t cmp; + +while (*p !=NULL ) { + parent = *p; + iter = rb_entry(parent, struct hist_entry, rb_node_in); + + cmp = fmt->collapse (fmt, iter, he); +if (!cmp) { +he_stat__add_stat (&iter->stat, &he->stat); +return iter; + } + +if (cmp <0 ) + p = &parent->rb_left; +else + p = &parent->rb_right; + } + + new =hist_entry__new (he, true); +if (new ==NULL ) +return NULL ; + +hists__apply_filters (hists, new); + hists->nr_entries++; + +/* save related format for output */ + new->fmt = fmt; + +/* it's now passed to 'new' */ + he->trace_output =NULL ; + +rb_link_node (&new->rb_node_in, parent, p); +rb_insert_color (&new->rb_node_in, root); +return new; +} + +static int hists__hierarchy_insert_entry (struct hists *hists, +struct rb_root *root, +struct hist_entry *he) +{ +struct perf_hpp_fmt *fmt; +struct hist_entry *new_he =NULL ; +struct hist_entry *parent =NULL ; +int depth =0 ; +int ret =0 ; + +hists__for_each_sort_list (hists, fmt) { +if (!perf_hpp__is_sort_entry (fmt) && + !perf_hpp__is_dynamic_entry (fmt)) +continue ; + +/* insert copy of 'he' for each fmt into the hierarchy */ + new_he =hierarchy_insert_entry (hists, root, he, fmt); +if (new_he ==NULL ) { + ret =-1 ; +break ; + } + + root = &new_he->hroot_in; + new_he->parent_he = parent; + new_he->depth = depth++; + parent = new_he; + } + +if (new_he) { + new_he->leaf = true; + +if (symbol_conf.use_callchain) { +callchain_cursor_reset (&callchain_cursor); +if (callchain_merge (&callchain_cursor, + new_he->callchain, + he->callchain) <0 ) + ret =-1 ; + } + } + +/* 'he' is no longer used */ +hist_entry__delete (he); + +/* return 0 (or -1) since it already applied filters */ +return ret; +} +int hists__collapse_insert_entry (struct hists *hists,struct rb_root *root,struct hist_entry *he) {
@@ -1054,6 +1147,9 @@ int hists__collapse_insert_entry(struct hists *hists, struct rb_root *root,struct hist_entry *iter;int64_t cmp; +if (symbol_conf.report_hierarchy) +return hists__hierarchy_insert_entry (hists, root, he); +while (*p !=NULL ) { parent = *p; iter = rb_entry(parent, struct hist_entry, rb_node_in);
@@ -1084,6 +1180,7 @@ int hists__collapse_insert_entry(struct hists *hists, struct rb_root *root, p = &(*p)->rb_right; } hists->nr_entries++; + he->leaf = true;rb_link_node (&he->rb_node_in, parent, p);rb_insert_color (&he->rb_node_in, root);
tools/perf/util/sort.h +12 -1
@@ -96,9 +96,11 @@ struct hist_entry {s32 socket;s32 cpu;u8 cpumode; +u8 depth;/* We are added by hists__add_dummy_entry. */ bool dummy; +bool leaf;char level;u8 filtered;
@@ -120,13 +122,22 @@ struct hist_entry {char *srcline;char *srcfile;struct symbol *parent; -struct rb_root sorted_chain;struct branch_info *branch_info;struct hists *hists;struct mem_info *mem_info;void *raw_data;u32 raw_size;void *trace_output; +struct perf_hpp_fmt *fmt; +struct hist_entry *parent_he; +union { +/* this is for hierarchical entry structure */ +struct { +struct rb_root hroot_in; +struct rb_root hroot_out; + };/* non-leaf entries */ +struct rb_root sorted_chain;/* leaf entry has callchains */ + };struct callchain_root callchain[0 ];/* must be last member */ };
tools/perf/util/symbol.h +2 -1
@@ -110,7 +110,8 @@ struct symbol_conf { has_filter, show_ref_callgraph, hide_unresolved, - raw_trace; + raw_trace, + report_hierarchy;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Signature · 1 line
2.7.1
Re: [PATCH v6 09/25] perf hists: Basic support of hierarchical report view
On Tue, Feb 16, 2016 at 11:08:27PM +0900, Namhyung Kim wrote:
SNIP
Quoted 20 lines
tools/perf/util/hist.c +20
-0+int64_t cmp; + +while (*p !=NULL ) { + parent = *p; + iter = rb_entry(parent, struct hist_entry, rb_node_in); + + cmp = fmt->collapse (fmt, iter, he); +if (!cmp) { +he_stat__add_stat (&iter->stat, &he->stat); +return iter; + } + +if (cmp <0 ) + p = &parent->rb_left; +else + p = &parent->rb_right; + } + + new =hist_entry__new (he, true); +if (new ==NULL )
tools/perf/util/hist.c int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, · line 1088
Quoted 10 lines
tools/perf/util/hist.c +10
-0+return NULL ; + +hists__apply_filters (hists, new); + hists->nr_entries++; + +/* save related format for output */ + new->fmt = fmt; + +/* it's now passed to 'new' */ + he->trace_output =NULL ;
should you do the same to he->srcline ?
jirka
Namhyung Kim
maintainerRe: [PATCH v6 09/25] perf hists: Basic support of hierarchical report view
Hi Jiri,
Quoted 28 lines · Jiri Olsa
On Tue, Feb 16, 2016 at 11:08:27PM +0900, Namhyung Kim wrote:
SNIP
Quoted 24 lines
tools/perf/util/hist.c +24
-0+int64_t cmp; + +while (*p !=NULL ) { + parent = *p; + iter = rb_entry(parent, struct hist_entry, rb_node_in); + + cmp = fmt->collapse (fmt, iter, he); +if (!cmp) { +he_stat__add_stat (&iter->stat, &he->stat); +return iter; + } + +if (cmp <0 ) + p = &parent->rb_left; +else + p = &parent->rb_right; + } + + new =hist_entry__new (he, true); +if (new ==NULL ) +return NULL ; + +hists__apply_filters (hists, new); + hists->nr_entries++;
Quoted 8 lines
tools/perf/util/hist.c int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, · line 1088
Quoted 6 lines
tools/perf/util/hist.c +6
-0+ +/* save related format for output */ + new->fmt = fmt; + +/* it's now passed to 'new' */ + he->trace_output =NULL ;should you do the same to
he->srcline?
Right! And he->srcflie too.. Actually they needs to be passed to a corresponding fmt rather than the first one. Will change to that direction in the v7.
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH v6 10/25 perf hists: Resort hist entries with hierarchy
In reply to Namhyung KimFor hierarchical output, each entries should be sorted in their rbtree (hroot) properly. Add hists__hierarchy_output_resort() to do the job. Note that those hierarchy entries share the period counts, it'd be important to update the hists->stats only once (for leaves).
--- tools/perf/util/hist.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 3 deletions(-)
tools/perf/util/hist.c +89 -3
@@ -1298,6 +1298,84 @@ void hists__inc_stats(struct hists *hists, struct hist_entry *h) hists->stats.total_period += h->stat.period; } +static void hierarchy_insert_output_entry (struct rb_root *root, +struct hist_entry *he) +{ +struct rb_node **p = &root->rb_node; +struct rb_node *parent =NULL ; +struct hist_entry *iter; + +while (*p !=NULL ) { + parent = *p; + iter = rb_entry(parent, struct hist_entry, rb_node); + +if (hist_entry__sort (he, iter) >0 ) + p = &parent->rb_left; +else + p = &parent->rb_right; + } + +rb_link_node (&he->rb_node, parent, p); +rb_insert_color (&he->rb_node, root); +} + +static void hists__hierarchy_output_resort (struct hists *hists, +struct ui_progress *prog, +struct rb_root *root_in, +struct rb_root *root_out, +u64 min_callchain_hits, +bool use_callchain) +{ +struct rb_node *node; +struct hist_entry *he; + + *root_out =RB_ROOT ; + node =rb_first (root_in); + +while (node) { + he = rb_entry(node, struct hist_entry, rb_node_in); + node =rb_next (node); + +hierarchy_insert_output_entry (root_out, he); + +if (prog) +ui_progress__update (prog,1 ); + +if (!he->leaf) { +hists__hierarchy_output_resort (hists, prog, + &he->hroot_in, + &he->hroot_out, + min_callchain_hits, + use_callchain); + hists->nr_entries++; +if (!he->filtered) + hists->nr_non_filtered_entries++; + +continue ; + } + +/* only update stat for leaf entries to avoid duplication */ +hists__inc_stats (hists, he); +if (!he->filtered) +hists__calc_col_len (hists, he); + +if (!use_callchain) +continue ; + +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); + } +} + static void __hists__insert_output_entry(struct rb_root *entries, struct hist_entry *he, u64 min_callchain_hits,
@@ -1349,6 +1427,17 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, min_callchain_hits = callchain_total * (callchain_param.min_percent /100 ); +hists__reset_stats (hists); +hists__reset_col_len (hists); + +if (symbol_conf.report_hierarchy) { +return hists__hierarchy_output_resort (hists, prog, + &hists->entries_collapsed, + &hists->entries, + min_callchain_hits, + use_callchain); + } +if (sort__need_collapse) root = &hists->entries_collapsed;else
@@ -1357,9 +1446,6 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, next =rb_first (root); hists->entries =RB_ROOT ; -hists__reset_stats (hists); -hists__reset_col_len (hists); -while (next) { n = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&n->rb_node_in);
Signature · 1 line
2.7.1
Re: [PATCH v6 10/25] perf hists: Resort hist entries with hierarchy
On Tue, Feb 16, 2016 at 11:08:28PM +0900, Namhyung Kim wrote:
SNIP
Quoted 19 lines
tools/perf/util/hist.c +11
-0@@ -1349,6 +1427,17 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, min_callchain_hits = callchain_total * (callchain_param.min_percent /100 ); +hists__reset_stats (hists); +hists__reset_col_len (hists); + +if (symbol_conf.report_hierarchy) { +return hists__hierarchy_output_resort (hists, prog, + &hists->entries_collapsed, + &hists->entries, + min_callchain_hits, + use_callchain); + } +if (sort__need_collapse) root = &hists->entries_collapsed;else
tools/perf/util/hist.c static void output_resort(struct hists *hists, struct ui_progress *prog, · line 1447
Quoted 2 lines
tools/perf/util/hist.c +0
-0@@ -1357,9 +1446,6 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, next =rb_first (root); hists->entries =RB_ROOT ;
above line could be moved together with those 2 below and you can then remove *root_out = RB_ROOT; line in hists__hierarchy_output_resort
jirka
Quoted 10 lines
tools/perf/util/hist.c +0
-3-hists__reset_stats (hists); -hists__reset_col_len (hists); -while (next) { n = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&n->rb_node_in);Signature · 1 line
2.7.1
Namhyung Kim
maintainerRe: [PATCH v6 10/25] perf hists: Resort hist entries with hierarchy
Quoted 21 lines · Jiri Olsa
On Tue, Feb 16, 2016 at 11:08:28PM +0900, Namhyung Kim wrote:
SNIP
Quoted 17 lines
tools/perf/util/hist.c +11
-0@@ -1349,6 +1427,17 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, min_callchain_hits = callchain_total * (callchain_param.min_percent /100 ); +hists__reset_stats (hists); +hists__reset_col_len (hists); + +if (symbol_conf.report_hierarchy) { +return hists__hierarchy_output_resort (hists, prog, + &hists->entries_collapsed, + &hists->entries, + min_callchain_hits, + use_callchain); + } +if (sort__need_collapse) root = &hists->entries_collapsed;
Quoted 8 lines
tools/perf/util/hist.c static void output_resort(struct hists *hists, struct ui_progress *prog, · line 1447
Quoted 4 lines
tools/perf/util/hist.c +0
-0else @@ -1357,9 +1446,6 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, next =rb_first (root); hists->entries =RB_ROOT ;above line could be moved together with those 2 below and you can then remove
*root_out=RB_ROOT; line inhists__hierarchy_output_resort
Nope. The root_out should be initialized anyway since it's called recursively with child's hroot_out.
Thanks,
Namhyung
Quoted 10 lines
Quoted 10 lines
tools/perf/util/hist.c +0
-3-hists__reset_stats (hists); -hists__reset_col_len (hists); -while (next) { n = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&n->rb_node_in);Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 11/25 perf hists: Add helper functions for hierarchy mode
In reply to Namhyung KimThe rb_hierarchy_{next,prev,last} functions are to traverse all hist entries in a hierarchy. They will be used by various function which supports hierarchy output.
As the rb_hierarchy_next() is used to traverse the whole hierarchy, it sometime needs to visit entries regardless of current folding state. So add enum hierarchy_move_dir and pass it to __rb_hierarchy_next() for those cases.
--- tools/perf/util/hist.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/hist.h | 16 ++++++++++++++ 2 files changed, 73 insertions(+)
tools/perf/util/hist.c +57 -0
@@ -1461,6 +1461,7 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, } } +void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog) {bool use_callchain;
@@ -1478,6 +1479,62 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog)output_resort (hists, prog, symbol_conf.use_callchain); } +static bool can_goto_child (struct hist_entry *he,enum hierarchy_move_dir hmd) +{ +if (he->leaf || hmd ==HMD_FORCE_SIBLING ) +return false; + +if (he->unfolded || hmd ==HMD_FORCE_CHILD ) +return true; + +return false; +} + +struct rb_node *rb_hierarchy_last (struct rb_node *node) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + +while (can_goto_child (he,HMD_NORMAL )) { + node =rb_last (&he->hroot_out); + he = rb_entry(node, struct hist_entry, rb_node); + } +return node; +} + +struct rb_node *__rb_hierarchy_next (struct rb_node *node,enum hierarchy_move_dir hmd) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + +if (can_goto_child (he, hmd)) + node =rb_first (&he->hroot_out); +else + node =rb_next (node); + +while (node ==NULL ) { + he = he->parent_he; +if (he ==NULL ) +break ; + + node =rb_next (&he->rb_node); + } +return node; +} + +struct rb_node *rb_hierarchy_prev (struct rb_node *node) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + + node =rb_prev (node); +if (node) +return rb_hierarchy_last (node); + + he = he->parent_he; +if (he ==NULL ) +return NULL ; + +return &he->rb_node; +} +static void hists__remove_entry_filter (struct hists *hists,struct hist_entry *h,enum hist_filter filter) {
tools/perf/util/hist.h +16 -0
@@ -415,4 +415,20 @@ int perf_hist_config(const char *var, const char *value);void perf_hpp_list__init (struct perf_hpp_list *list); +enum hierarchy_move_dir { +HMD_NORMAL , +HMD_FORCE_SIBLING , +HMD_FORCE_CHILD , +}; + +struct rb_node *rb_hierarchy_last (struct rb_node *node); +struct rb_node *__rb_hierarchy_next (struct rb_node *node, +enum hierarchy_move_dir hmd); +struct rb_node *rb_hierarchy_prev (struct rb_node *node); + +static inline struct rb_node *rb_hierarchy_next (struct rb_node *node) +{ +return __rb_hierarchy_next (node,HMD_NORMAL ); +} +#endif /* __PERF_HIST_H */
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 12/25 perf hists: Introduce hist_entry__filter()
In reply to Namhyung KimThe hist_entry__filter() function is to filter hist entries using sort key relatd info. This is needed to support hierarchy mode since each hist entry will be associated with a hpp fmt which has a sort key. So each entry should compare to only matching type of filters.
To do that, add the ->se_filter callback field to struct sort_entry. This callback takes 'type' argument which determines whether it's matching sort key or not. It returns -1 for non-matching type, 0 for filtered entry and 1 for not filtered entries.
--- tools/perf/util/hist.h | 2 + tools/perf/util/sort.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/sort.h | 1 + 3 files changed, 116 insertions(+)
tools/perf/util/hist.h +2 -0
@@ -302,6 +302,8 @@ bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format);bool perf_hpp__is_dynamic_entry (struct perf_hpp_fmt *format);bool perf_hpp__defined_dynamic_entry (struct perf_hpp_fmt *fmt,struct hists *hists); +int hist_entry__filter (struct hist_entry *he,int type,const void *arg); +static inline bool perf_hpp__should_skip (struct perf_hpp_fmt *format,struct hists *hists) {
tools/perf/util/sort.c +113 -0
206 lines not on this page · raw message
tools/perf/util/sort.h +1 -0
@@ -234,6 +234,7 @@ struct sort_entry {int64_t (*se_sort)(struct hist_entry *,struct hist_entry *);int (*se_snprintf)(struct hist_entry *he,char *bf,size_t size,unsigned int width); +int (*se_filter)(struct hist_entry *he,int type,const void *arg);u8 se_width_idx; };
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 13/25 perf hists: Support filtering in hierarchy mode
In reply to Namhyung KimThe hists__filter_hierarchy() function implements filtering in hierarchy mode. Now we have hist_entry__filter() so use it for entries in the hierarchy. It returns 3 kind of values.
A negative value means that it's not filtered by this type. It marks current entry as filtered tentatively so if a lower level entry removes the filter it also removes the all parent so that we can find the entry in the output.
Zero means it's filtered out by this type. A positive value means it's not filtered so it removes the filter and shows in the output. In these cases, it moves to next entry since lower level entry won't match by this type of filter anymore. Thus all children will be filtered or not together.
--- tools/perf/util/hist.c | 101 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 8 deletions(-)
tools/perf/util/hist.c +93 -8
@@ -1539,6 +1539,27 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h enum hist_filter filter) { h->filtered &= ~(1 << filter); + +if (symbol_conf.report_hierarchy) { +struct hist_entry *parent = h->parent_he; + +while (parent) { +he_stat__add_stat (&parent->stat, &h->stat); + + parent->filtered &= ~(1 << filter); + +if (parent->filtered) + goto next; + +/* force fold unfiltered entry for simplicity */ + parent->unfolded = false; + parent->row_offset =0 ; + parent->nr_rows =0 ; +next: + parent = parent->parent_he; + } + } +if (h->filtered)return ;
@@ -1624,28 +1645,92 @@ static void hists__filter_by_type(struct hists *hists, int type, filter_fn_t fil } } +static void hists__filter_hierarchy (struct hists *hists,int type,const void *arg) +{ +struct rb_node *nd; + + hists->stats.nr_non_filtered_samples =0 ; + +hists__reset_filter_stats (hists); +hists__reset_col_len (hists); + + nd =rb_first (&hists->entries); +while (nd) { + struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); +int ret; + + ret =hist_entry__filter (h, type, arg); + +/* +* case 1. non-matching type +* zero out the period, set filter marker and move to child +*/ +if (ret <0 ) { +memset (&h->stat,0 ,sizeof (h->stat)); + h->filtered |= (1 << type); + + nd =__rb_hierarchy_next (&h->rb_node,HMD_FORCE_CHILD ); + } +/* +* case 2. matched type (filter out) +* set filter marker and move to next +*/ +else if (ret ==1 ) { + h->filtered |= (1 << type); + + nd =__rb_hierarchy_next (&h->rb_node,HMD_FORCE_SIBLING ); + } +/* +* case 3. ok (not filtered) +* add period to hists and parents, erase the filter marker +* and move to next sibling +*/ +else { +hists__remove_entry_filter (hists, h, type); + + nd =__rb_hierarchy_next (&h->rb_node,HMD_FORCE_SIBLING ); + } + } +} +void hists__filter_by_thread (struct hists *hists) { -hists__filter_by_type (hists,HIST_FILTER__THREAD , - hists__filter_entry_by_thread); +if (symbol_conf.report_hierarchy) +hists__filter_hierarchy (hists,HIST_FILTER__THREAD , + hists->thread_filter); +else +hists__filter_by_type (hists,HIST_FILTER__THREAD , + hists__filter_entry_by_thread); }void hists__filter_by_dso (struct hists *hists) { -hists__filter_by_type (hists,HIST_FILTER__DSO , - hists__filter_entry_by_dso); +if (symbol_conf.report_hierarchy) +hists__filter_hierarchy (hists,HIST_FILTER__DSO , + hists->dso_filter); +else +hists__filter_by_type (hists,HIST_FILTER__DSO , + hists__filter_entry_by_dso); }void hists__filter_by_symbol (struct hists *hists) { -hists__filter_by_type (hists,HIST_FILTER__SYMBOL , - hists__filter_entry_by_symbol); +if (symbol_conf.report_hierarchy) +hists__filter_hierarchy (hists,HIST_FILTER__SYMBOL , + hists->symbol_filter_str); +else +hists__filter_by_type (hists,HIST_FILTER__SYMBOL , + hists__filter_entry_by_symbol); }void hists__filter_by_socket (struct hists *hists) { -hists__filter_by_type (hists,HIST_FILTER__SOCKET , - hists__filter_entry_by_socket); +if (symbol_conf.report_hierarchy) +hists__filter_hierarchy (hists,HIST_FILTER__SOCKET , + &hists->socket_filter); +else +hists__filter_by_type (hists,HIST_FILTER__SOCKET , + hists__filter_entry_by_socket); }void events_stats__inc (struct events_stats *stats,u32 type)
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 14/25 perf hists: Resort after filtering hierarchy
In reply to Namhyung KimIn hierarchy mode, a filter can affect periods of entries in upper hierarchy. So it needs to resort the hists after filter.
For example, let's look at following example:
Overhead Command / Shared Object / Symbol
------------ --------------------------------
30.00% perf
20.00% perf
10.00% main
5.00% pr_debug
5.00% memcpy
10.00% [kernel.vmlinux]
8.00% memset
2.00% cpu_idleIf we apply simbol filter for 'mem' it should look like this
13.00% perf
8.00% [kernel.vmlinux]
8.00% memset
5.00% perf
5.00% memcpy--- tools/perf/util/hist.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
tools/perf/util/hist.c +54 -0
@@ -1645,9 +1645,47 @@ static void hists__filter_by_type(struct hists *hists, int type, filter_fn_t fil } } +static void resort_filtered_entry (struct rb_root *root,struct hist_entry *he) +{ +struct rb_node **p = &root->rb_node; +struct rb_node *parent =NULL ; +struct hist_entry *iter; +struct rb_root new_root =RB_ROOT ; +struct rb_node *nd; + +while (*p !=NULL ) { + parent = *p; + iter = rb_entry(parent, struct hist_entry, rb_node); + +if (hist_entry__sort (he, iter) >0 ) + p = &(*p)->rb_left; +else + p = &(*p)->rb_right; + } + +rb_link_node (&he->rb_node, parent, p); +rb_insert_color (&he->rb_node, root); + +if (he->leaf || he->filtered) +return ; + + nd =rb_first (&he->hroot_out); +while (nd) { + struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); + + nd =rb_next (nd); +rb_erase (&h->rb_node, &he->hroot_out); + +resort_filtered_entry (&new_root, h); + } + + he->hroot_out = new_root; +} +static void hists__filter_hierarchy (struct hists *hists,int type,const void *arg) {struct rb_node *nd; +struct rb_root new_root =RB_ROOT ; hists->stats.nr_non_filtered_samples =0 ;
@@ -1691,6 +1729,22 @@ static void hists__filter_hierarchy(struct hists *hists, int type, const void *a nd =__rb_hierarchy_next (&h->rb_node,HMD_FORCE_SIBLING ); } } + +/* +* resort output after applying a new filter since filter in a lower +* hierarchy can change periods in a upper hierarchy. +*/ + nd =rb_first (&hists->entries); +while (nd) { + struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); + + nd =rb_next (nd); +rb_erase (&h->rb_node, &hists->entries); + +resort_filtered_entry (&new_root, h); + } + + hists->entries = new_root; }void hists__filter_by_thread (struct hists *hists)
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 15/25 perf hists: Count number of sort keys
In reply to Namhyung KimIt'll be used for hierarchy output mode to indent entries properly.
--- tools/perf/ui/hist.c | 3 +++ tools/perf/util/hist.h | 1 + 2 files changed, 4 insertions(+)
tools/perf/ui/hist.c +3 -0
@@ -514,6 +514,9 @@ void perf_hpp_list__column_register(struct perf_hpp_list *list,void perf_hpp_list__register_sort_field (struct perf_hpp_list *list,struct perf_hpp_fmt *format) { +if (perf_hpp__is_sort_entry (format) ||perf_hpp__is_dynamic_entry (format)) + list->nr_sort_keys++; +list_add_tail (&format->sort_list, &list->sorts); }
tools/perf/util/hist.h +1 -0
@@ -237,6 +237,7 @@ struct perf_hpp_fmt {struct perf_hpp_list {struct list_head fields;struct list_head sorts; +int nr_sort_keys; };extern struct perf_hpp_list perf_hpp_list;
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 16/25 perf ui/stdio: Implement hierarchy output mode
In reply to Namhyung KimThe hierarchy output mode is to group entries for each level so that user can see higher level picture more easily. It also helps to find out which component is most costly. The output will look like below:
15.11% swapper
14.97% [kernel.vmlinux]
0.09% [libahci]
0.05% [iwlwifi]
10.29% irq/33-iwlwifi
6.45% [kernel.vmlinux]
1.41% [mac80211]
1.15% [iwldvm]
1.14% [iwlwifi]
0.14% [cfg80211]
4.81% firefox
3.92% libxul.so
0.34% [kernel.vmlinux]--- tools/perf/ui/stdio/hist.c | 74 +++++++++++++++++++++++++++++++++++++++++++++- tools/perf/util/hist.h | 2 ++ 2 files changed, 75 insertions(+), 1 deletion(-)
tools/perf/ui/stdio/hist.c +73 -1
@@ -410,6 +410,71 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)return hpp->buf - start; } +static int hist_entry__hierarchy_fprintf (struct hist_entry *he, +struct perf_hpp *hpp, +int nr_sort_key,struct hists *hists, +FILE *fp) +{ +const char *sep = symbol_conf.field_sep; +struct perf_hpp_fmt *fmt; +char *buf = hpp->buf; +int ret, printed =0 ; +bool first = true; + +if (symbol_conf.exclude_other && !he->parent) +return 0 ; + + ret =scnprintf (hpp->buf, hpp->size,"%*s" , he->depth *HIERARCHY_INDENT ,"" ); +advance_hpp (hpp, ret); + +hists__for_each_format (he->hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + +/* +* If there's no field_sep, we still need +* to display initial ' '. +*/ +if (!sep || !first) { + ret =scnprintf (hpp->buf, hpp->size,"%s" , sep ?:" " ); +advance_hpp (hpp, ret); + }else + first = false; + +if (perf_hpp__use_color () && fmt->color) + ret = fmt->color (fmt, hpp, he); +else + ret = fmt->entry (fmt, hpp, he); + +advance_hpp (hpp, ret); + } + +if (sep) + ret =scnprintf (hpp->buf, hpp->size,"%s" , sep); +else + ret =scnprintf (hpp->buf, hpp->size,"%*s" , + (nr_sort_key -1 ) *HIERARCHY_INDENT +2 ,"" ); +advance_hpp (hpp, ret); + + fmt = he->fmt; +if (perf_hpp__use_color () && fmt->color) + fmt->color (fmt, hpp, he); +else + fmt->entry (fmt, hpp, he); + + printed +=fprintf (fp,"%s\n" , buf); + +if (symbol_conf.use_callchain && he->leaf) { +u64 total =hists__total_period (hists); + + printed +=hist_entry_callchain__fprintf (he, total,0 , fp); + goto out; + } + +out: +return printed; +} +static int hist_entry__fprintf (struct hist_entry *he,size_t size,struct hists *hists,char *bf,size_t bfsz,FILE *fp)
@@ -424,6 +489,13 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,if (size ==0 || size > bfsz) size = hpp.size = bfsz; +if (symbol_conf.report_hierarchy) { +int nr_sort = hists->hpp_list->nr_sort_keys; + +return hist_entry__hierarchy_fprintf (he, &hpp, nr_sort, + hists, fp); + } +hist_entry__snprintf (he, &hpp); ret =fprintf (fp,"%s\n" , bf);
@@ -522,7 +594,7 @@ print_entries: goto out; } -for (nd =rb_first (&hists->entries); nd; nd =rb_next (nd)) { +for (nd =rb_first (&hists->entries); nd; nd =__rb_hierarchy_next (nd,HMD_FORCE_CHILD )) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);float percent;
tools/perf/util/hist.h +2 -0
@@ -434,4 +434,6 @@ static inline struct rb_node *rb_hierarchy_next(struct rb_node *node) return __rb_hierarchy_next(node, HMD_NORMAL); } +#define HIERARCHY_INDENT 3 +#endif /* __PERF_HIST_H */
Signature · 1 line
2.7.1
Re: [PATCH v6 16/25] perf ui/stdio: Implement hierarchy output mode
On Tue, Feb 16, 2016 at 11:08:34PM +0900, Namhyung Kim wrote:
SNIP
Quoted 27 lines
tools/perf/ui/stdio/hist.c +27
-0+static int hist_entry__hierarchy_fprintf (struct hist_entry *he, +struct perf_hpp *hpp, +int nr_sort_key,struct hists *hists, +FILE *fp) +{ +const char *sep = symbol_conf.field_sep; +struct perf_hpp_fmt *fmt; +char *buf = hpp->buf; +int ret, printed =0 ; +bool first = true; + +if (symbol_conf.exclude_other && !he->parent) +return 0 ; + + ret =scnprintf (hpp->buf, hpp->size,"%*s" , he->depth *HIERARCHY_INDENT ,"" ); +advance_hpp (hpp, ret); + +hists__for_each_format (he->hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + +/* +* If there's no field_sep, we still need +* to display initial ' '. +*/ +if (!sep || !first) { + ret =scnprintf (hpp->buf, hpp->size,"%s" , sep ?:" " );
tools/perf/ui/stdio/hist.c static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) · line 449
Quoted 10 lines
tools/perf/ui/stdio/hist.c +10
-0+advance_hpp (hpp, ret); + }else + first = false; + +if (perf_hpp__use_color () && fmt->color) + ret = fmt->color (fmt, hpp, he); +else + ret = fmt->entry (fmt, hpp, he); + +advance_hpp (hpp, ret);
there's new hist_entry__snprintf_alignment function for proper alignment now used in hist_entry__hierarchy_fprintf
you might wat to use it in here as well
jirka
Namhyung Kim
maintainerRe: [PATCH v6 16/25] perf ui/stdio: Implement hierarchy output mode
Quoted 45 lines · Jiri Olsa
On Tue, Feb 16, 2016 at 11:08:34PM +0900, Namhyung Kim wrote:
SNIP
Quoted 27 lines
tools/perf/ui/stdio/hist.c +27
-0+static int hist_entry__hierarchy_fprintf (struct hist_entry *he, +struct perf_hpp *hpp, +int nr_sort_key,struct hists *hists, +FILE *fp) +{ +const char *sep = symbol_conf.field_sep; +struct perf_hpp_fmt *fmt; +char *buf = hpp->buf; +int ret, printed =0 ; +bool first = true; + +if (symbol_conf.exclude_other && !he->parent) +return 0 ; + + ret =scnprintf (hpp->buf, hpp->size,"%*s" , he->depth *HIERARCHY_INDENT ,"" ); +advance_hpp (hpp, ret); + +hists__for_each_format (he->hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + +/* +* If there's no field_sep, we still need +* to display initial ' '. +*/ +if (!sep || !first) { + ret =scnprintf (hpp->buf, hpp->size,"%s" , sep ?:" " );tools/perf/ui/stdio/hist.c static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) · line 449
Quoted 10 lines
tools/perf/ui/stdio/hist.c +10
-0+advance_hpp (hpp, ret); + }else + first = false; + +if (perf_hpp__use_color () && fmt->color) + ret = fmt->color (fmt, hpp, he); +else + ret = fmt->entry (fmt, hpp, he); + +advance_hpp (hpp, ret);there's new
hist_entry__snprintf_alignmentfunction for proper alignment now used inhist_entry__hierarchy_fprintf
Quoted 1 line
you might wat to use it in here as well
Ah missed that, will change.
Btw it seems it's not strictly needed here since the hierarchy mode makes each column as the last though. But I agree that it's a general change and can be applied here as well.
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH v6 17/25 perf ui/stdio: Align column header for hierarchy output
In reply to Namhyung KimThe hierarchy output mode is to group entries so the existing columns won't fit to the new output. Treat all sort keys as a single column and separate headers by "/".
# Overhead Command / Shared Object
# ........... ................................
#
15.11% swapper
14.97% [kernel.vmlinux]
0.09% [libahci]
0.05% [iwlwifi]
...--- tools/perf/ui/stdio/hist.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/ctype.c | 9 ++++ tools/perf/util/util.h | 2 + 3 files changed, 112 insertions(+)
tools/perf/ui/stdio/hist.c +101 -0
@@ -506,6 +506,102 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,return ret; } +static int print_hierarchy_indent (const char *sep,int nr_sort, +const char *line,FILE *fp) +{ +if (sep !=NULL || nr_sort <1 ) +return 0 ; + +return fprintf (fp,"%-.*s" , (nr_sort -1 ) *HIERARCHY_INDENT , line); +} + +static int print_hierarchy_header (struct hists *hists,struct perf_hpp *hpp, +const char *sep,FILE *fp) +{ +bool first = true; +int nr_sort; +unsigned width =0 ; +unsigned header_width =0 ; +struct perf_hpp_fmt *fmt; + + nr_sort = hists->hpp_list->nr_sort_keys; + +/* preserve max indent depth for column headers */ +print_hierarchy_indent (sep, nr_sort, spaces, fp); + +hists__for_each_format (hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (!first) +fprintf (fp,"%s" , sep ?:" " ); +else + first = false; + + fmt->header (fmt, hpp,hists_to_evsel (hists)); +fprintf (fp,"%s" , hpp->buf); + } + +/* combine sort headers with ' / ' */ + first = true; +hists__for_each_format (hists, fmt) { +if (!perf_hpp__is_sort_entry (fmt) && !perf_hpp__is_dynamic_entry (fmt)) +continue ; + +if (!first) + header_width +=fprintf (fp," / " ); +else { + header_width +=fprintf (fp,"%s" , sep ?:" " ); + first = false; + } + + fmt->header (fmt, hpp,hists_to_evsel (hists)); +rtrim (hpp->buf); + + header_width +=fprintf (fp,"%s" , hpp->buf); + } + +/* preserve max indent depth for combined sort headers */ +print_hierarchy_indent (sep, nr_sort, spaces, fp); + +fprintf (fp,"\n# " ); + +/* preserve max indent depth for initial dots */ +print_hierarchy_indent (sep, nr_sort, dots, fp); + + first = true; +hists__for_each_format (hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (!first) +fprintf (fp,"%s" , sep ?:" " ); +else + first = false; + + width = fmt->width (fmt, hpp,hists_to_evsel (hists)); +fprintf (fp,"%.*s" , width, dots); + } + +hists__for_each_format (hists, fmt) { +if (!perf_hpp__is_sort_entry (fmt) && !perf_hpp__is_dynamic_entry (fmt)) +continue ; + + width = fmt->width (fmt, hpp,hists_to_evsel (hists)); +if (width > header_width) + header_width = width; + } + +fprintf (fp,"%s%-.*s" , sep ?:" " , header_width, dots); + +/* preserve max indent depth for dots under sort headers */ +print_hierarchy_indent (sep, nr_sort, dots, fp); + +fprintf (fp,"\n#\n" ); + +return 2 ; +} +size_t hists__fprintf (struct hists *hists,bool show_header,int max_rows,int max_cols,float min_pcnt,FILE *fp) {
@@ -537,6 +633,11 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,fprintf (fp,"# " ); +if (symbol_conf.report_hierarchy) { + nr_rows +=print_hierarchy_header (hists, &dummy_hpp, sep, fp); + goto print_entries; + } +hists__for_each_format (hists, fmt) {if (perf_hpp__should_skip (fmt, hists))continue ;
tools/perf/util/ctype.c +9 -0
@@ -32,8 +32,17 @@ unsigned char sane_ctype[256] = {const char *graph_line ="_____________________________________________________________________" +"_____________________________________________________________________" "_____________________________________________________________________" ;const char *graph_dotted_line ="---------------------------------------------------------------------" "---------------------------------------------------------------------" "---------------------------------------------------------------------" ; +const char *spaces = +" " +" " +" " ; +const char *dots = +"....................................................................." +"....................................................................." +"....................................................................." ;
tools/perf/util/util.h +2 -0
@@ -82,6 +82,8 @@extern const char *graph_line;extern const char *graph_dotted_line; +extern const char *spaces; +extern const char *dots;extern char buildid_dir[];/* On most systems <limits.h> would have given us this, but
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 18/25 perf hists browser: Count number of hierarchy entries
In reply to Namhyung KimAdd nr_hierarchy_entries field to keep current number of (unfolded) hist entries. And the hist_entry->nr_rows carries number of direct children. But in the hierarchy mode, entry can have grand children and callchains. So update the number properly using hierarchy_count_rows() when toggling the folded state (by pressing ENTER key).
--- tools/perf/ui/browsers/hists.c | 85 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 11 deletions(-)
tools/perf/ui/browsers/hists.c +74 -11
@@ -32,6 +32,7 @@ struct hist_browser {bool show_headers;float min_pcnt;u64 nr_non_filtered_entries; +u64 nr_hierarchy_entries;u64 nr_callchain_rows; };
@@ -58,11 +59,11 @@ static int hist_browser__get_folding(struct hist_browser *browser)for (nd =rb_first (&hists->entries); (nd =hists__filter_entries (nd, browser->min_pcnt)) !=NULL ; - nd =rb_next (nd)) { + nd =rb_hierarchy_next (nd)) {struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node); -if (he->unfolded) +if (he->leaf && he->unfolded) unfolded_rows += he->nr_rows; }return unfolded_rows;
@@ -72,7 +73,9 @@ static u32 hist_browser__nr_entries(struct hist_browser *hb) {u32 nr_entries; -if (hist_browser__has_filter (hb)) +if (symbol_conf.report_hierarchy) + nr_entries = hb->nr_hierarchy_entries; +else if (hist_browser__has_filter (hb)) nr_entries = hb->nr_non_filtered_entries;else nr_entries = hb->hists->nr_entries;
@@ -247,6 +250,35 @@ static int callchain__count_rows(struct rb_root *chain)return n; } +static int hierarchy_count_rows (struct hist_browser *hb,struct hist_entry *he, +bool include_children) +{ +int count =0 ; +struct rb_node *node; +struct hist_entry *child; + +if (he->leaf) +return callchain__count_rows (&he->sorted_chain); + + node =rb_first (&he->hroot_out); +while (node) { +float percent; + + child = rb_entry(node, struct hist_entry, rb_node); + percent =hist_entry__get_percent_limit (child); + +if (!child->filtered && percent >= hb->min_pcnt) { + count++; + +if (include_children && child->unfolded) + count +=hierarchy_count_rows (hb, child, true); + } + + node =rb_next (node); + } +return count; +} +static bool hist_entry__toggle_fold (struct hist_entry *he) {if (!he)
@@ -326,11 +358,17 @@ static void callchain__init_have_children(struct rb_root *root)static void hist_entry__init_have_children (struct hist_entry *he) { -if (!he->init_have_children) { +if (he->init_have_children) +return ; + +if (he->leaf) { he->has_children = !RB_EMPTY_ROOT (&he->sorted_chain);callchain__init_have_children (&he->sorted_chain); - he->init_have_children = true; + }else { + he->has_children = !RB_EMPTY_ROOT (&he->hroot_out); } + + he->init_have_children = true; }static bool hist_browser__toggle_fold (struct hist_browser *browser)
@@ -349,17 +387,41 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser) has_children =callchain_list__toggle_fold (cl);if (has_children) { +int child_rows =0 ; +hist_entry__init_have_children (he); browser->b.nr_entries -= he->nr_rows; - browser->nr_callchain_rows -= he->nr_rows; -if (he->unfolded) - he->nr_rows =callchain__count_rows (&he->sorted_chain); +if (he->leaf) + browser->nr_callchain_rows -= he->nr_rows;else + browser->nr_hierarchy_entries -= he->nr_rows; + +if (symbol_conf.report_hierarchy) + child_rows =hierarchy_count_rows (browser, he, true); + +if (he->unfolded) { +if (he->leaf) + he->nr_rows =callchain__count_rows (&he->sorted_chain); +else + he->nr_rows =hierarchy_count_rows (browser, he, false); + +/* account grand children */ +if (symbol_conf.report_hierarchy) + browser->b.nr_entries += child_rows - he->nr_rows; + }else { +if (symbol_conf.report_hierarchy) + browser->b.nr_entries -= child_rows - he->nr_rows; + he->nr_rows =0 ; + } browser->b.nr_entries += he->nr_rows; - browser->nr_callchain_rows += he->nr_rows; + +if (he->leaf) + browser->nr_callchain_rows += he->nr_rows; +else + browser->nr_hierarchy_entries += he->nr_rows;return true; }
@@ -2025,17 +2087,18 @@ static void hist_browser__update_nr_entries(struct hist_browser *hb)u64 nr_entries =0 ;struct rb_node *nd =rb_first (&hb->hists->entries); -if (hb->min_pcnt ==0 ) { +if (hb->min_pcnt ==0 && !symbol_conf.report_hierarchy) { hb->nr_non_filtered_entries = hb->hists->nr_non_filtered_entries;return ; }while ((nd =hists__filter_entries (nd, hb->min_pcnt)) !=NULL ) { nr_entries++; - nd =rb_next (nd); + nd =rb_hierarchy_next (nd); } hb->nr_non_filtered_entries = nr_entries; + hb->nr_hierarchy_entries = nr_entries; } static void hist_browser__update_percent_limit(struct hist_browser *hb,
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 19/25 perf hists browser: Support collapsing/expanding whole entries in hierarchy
In reply to Namhyung KimThe 'C' and 'E' keys are to collapse/expand all hist entries. Update nr_hierarchy_entries properly in this case.
--- tools/perf/ui/browsers/hists.c | 58 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 10 deletions(-)
tools/perf/ui/browsers/hists.c +48 -10
@@ -484,13 +484,38 @@ static int callchain__set_folding(struct rb_root *chain, bool unfold)return n; } -static void hist_entry__set_folding (struct hist_entry *he,bool unfold) +static int hierarchy_set_folding (struct hist_browser *hb,struct hist_entry *he, +bool unfold__maybe_unused ) +{ +float percent; +struct rb_node *nd; +struct hist_entry *child; +int n =0 ; + +for (nd =rb_first (&he->hroot_out); nd; nd =rb_next (nd)) { + child = rb_entry(nd, struct hist_entry, rb_node); + percent =hist_entry__get_percent_limit (child); +if (!child->filtered && percent >= hb->min_pcnt) + n++; + } + +return n; +} + +static void hist_entry__set_folding (struct hist_entry *he, +struct hist_browser *hb,bool unfold) {hist_entry__init_have_children (he); he->unfolded = unfold ? he->has_children : false;if (he->has_children) { -int n =callchain__set_folding (&he->sorted_chain, unfold); +int n; + +if (he->leaf) + n =callchain__set_folding (&he->sorted_chain, unfold); +else + n =hierarchy_set_folding (hb, he, unfold); + he->nr_rows = unfold ? n :0 ; }else he->nr_rows =0 ;
@@ -500,19 +525,32 @@ static void __hist_browser__set_folding(struct hist_browser *browser, bool unfold) {struct rb_node *nd; -struct hists *hists = browser->hists; +struct hist_entry *he; +double percent; -for (nd =rb_first (&hists->entries); - (nd =hists__filter_entries (nd, browser->min_pcnt)) !=NULL ; - nd =rb_next (nd)) { - struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node); -hist_entry__set_folding (he, unfold); - browser->nr_callchain_rows += he->nr_rows; + nd =rb_first (&browser->hists->entries); +while (nd) { + he = rb_entry(nd, struct hist_entry, rb_node); + +/* set folding state even if it's currently folded */ + nd =__rb_hierarchy_next (nd,HMD_FORCE_CHILD ); + +hist_entry__set_folding (he, browser, unfold); + + percent =hist_entry__get_percent_limit (he); +if (he->filtered || percent < browser->min_pcnt) +continue ; + +if (!he->depth || unfold) + browser->nr_hierarchy_entries++; +if (he->leaf) + browser->nr_callchain_rows += he->nr_rows; } }static void hist_browser__set_folding (struct hist_browser *browser,bool unfold) { + browser->nr_hierarchy_entries =0 ; browser->nr_callchain_rows =0 ;__hist_browser__set_folding (browser, unfold);
@@ -2131,7 +2169,7 @@ static void hist_browser__update_percent_limit(struct hist_browser *hb,/* force to re-evaluate folding state of callchains */ he->init_have_children = false; -hist_entry__set_folding (he, false); +hist_entry__set_folding (he, hb, false); nd =rb_next (nd); }
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 20/25 perf hists browser: Implement hierarchy output
In reply to Namhyung KimImplement hierarchy mode in TUI. The output is look like stdio but it also supports to fold/unfold children dynamically.
--- tools/perf/ui/browsers/hists.c | 269 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 247 insertions(+), 22 deletions(-)
tools/perf/ui/browsers/hists.c +247 -22
@@ -1260,6 +1260,137 @@ static int hist_browser__show_entry(struct hist_browser *browser,return printed; } +static int hist_browser__show_hierarchy_entry (struct hist_browser *browser, +struct hist_entry *entry, +unsigned short row, +int level,int nr_sort_keys) +{ +char s[256 ]; +int printed =0 ; +int width = browser->b.width; +char folded_sign =' ' ; +bool current_entry =ui_browser__is_current_entry (&browser->b, row); +off_t row_offset = entry->row_offset; +bool first = true; +struct perf_hpp_fmt *fmt; +struct hpp_arg arg = { + .b = &browser->b, + .current_entry = current_entry, + }; +struct perf_hpp hpp = { + .buf = s, + .size =sizeof (s), + .ptr = &arg, + }; +int column =0 ; +int hierarchy_indent = (nr_sort_keys -1 ) *HIERARCHY_INDENT ; + +if (current_entry) { + browser->he_selection = entry; + browser->selection = &entry->ms; + } + +hist_entry__init_have_children (entry); + folded_sign =hist_entry__folded (entry); + arg.folded_sign = folded_sign; + +if (entry->leaf && row_offset) { + row_offset--; + goto show_callchain; + } + +hist_browser__gotorc (browser, row,0 ); + +if (current_entry && browser->b.navkeypressed) +ui_browser__set_color (&browser->b,HE_COLORSET_SELECTED ); +else +ui_browser__set_color (&browser->b,HE_COLORSET_NORMAL ); + +ui_browser__write_nstring (&browser->b,"" , level *HIERARCHY_INDENT ); + width -= level *HIERARCHY_INDENT ; + +hists__for_each_format (entry->hists, fmt) { +if (perf_hpp__should_skip (fmt, entry->hists) || + column++ < browser->b.horiz_scroll) +continue ; + +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (current_entry && browser->b.navkeypressed) { +ui_browser__set_color (&browser->b, +HE_COLORSET_SELECTED ); + }else { +ui_browser__set_color (&browser->b, +HE_COLORSET_NORMAL ); + } + +if (first) { +ui_browser__printf (&browser->b,"%c" , folded_sign); + width--; + first = false; + }else { +ui_browser__printf (&browser->b," " ); + width -=2 ; + } + +if (fmt->color) { + width -= fmt->color (fmt, &hpp, entry); + }else { + width -= fmt->entry (fmt, &hpp, entry); +ui_browser__printf (&browser->b,"%s" , s); + } + } + +ui_browser__write_nstring (&browser->b,"" , hierarchy_indent); + width -= hierarchy_indent; + +if (column >= browser->b.horiz_scroll) { +if (current_entry && browser->b.navkeypressed) { +ui_browser__set_color (&browser->b, +HE_COLORSET_SELECTED ); + }else { +ui_browser__set_color (&browser->b, +HE_COLORSET_NORMAL ); + } + +ui_browser__write_nstring (&browser->b,"" ,2 ); + width -=2 ; + + fmt = entry->fmt; +if (fmt->color) { + width -= fmt->color (fmt, &hpp, entry); + }else { + width -= fmt->entry (fmt, &hpp, entry); +ui_browser__printf (&browser->b,"%s" , s); + } + } + +/* The scroll bar isn't being used */ +if (!browser->b.navkeypressed) + width +=1 ; + +ui_browser__write_nstring (&browser->b,"" , width); + + ++row; + ++printed; + +show_callchain: +if (entry->leaf && folded_sign =='-' && row != browser->b.rows) { +struct callchain_print_arg carg = { + .row_offset = row_offset, + }; + + printed +=hist_browser__show_callchain (browser, entry, + level +1 , row, + hist_browser__show_callchain_entry, &carg, + hist_browser__check_output_full); + } + +return printed; +} +static int advance_hpp_check (struct perf_hpp *hpp,int inc) {advance_hpp (hpp, inc);
@@ -1325,6 +1456,7 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)u16 header_offset =0 ;struct rb_node *nd; struct hist_browser *hb = container_of(browser, struct hist_browser, b); +int nr_sort = hb->hists->hpp_list->nr_sort_keys;if (hb->show_headers) {hist_browser__show_headers (hb);
@@ -1335,18 +1467,28 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser) hb->he_selection =NULL ; hb->selection =NULL ; -for (nd = browser->top; nd; nd =rb_next (nd)) { +for (nd = browser->top; nd; nd =rb_hierarchy_next (nd)) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);float percent; -if (h->filtered) +if (h->filtered) { +/* let it move to sibling */ + h->unfolded = false;continue ; + } percent =hist_entry__get_percent_limit (h);if (percent < hb->min_pcnt)continue ; - row +=hist_browser__show_entry (hb, h, row); +if (symbol_conf.report_hierarchy) { + row +=hist_browser__show_hierarchy_entry (hb, h, row, + h->depth, + nr_sort); + }else { + row +=hist_browser__show_entry (hb, h, row); + } +if (row == browser->rows)break ; }
@@ -1364,7 +1506,14 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd,if (!h->filtered && percent >= min_pcnt)return nd; - nd =rb_next (nd); +/* +* If it's filtered, its all children also were filtered. +* So move to sibling node. +*/ +if (rb_next (nd)) + nd =rb_next (nd); +else + nd =rb_hierarchy_next (nd); }return NULL ;
@@ -1380,7 +1529,7 @@ static struct rb_node *hists__filter_prev_entries(struct rb_node *nd,if (!h->filtered && percent >= min_pcnt)return nd; - nd =rb_prev (nd); + nd =rb_hierarchy_prev (nd); }return NULL ;
@@ -1410,8 +1559,8 @@ static void ui_browser__hists_seek(struct ui_browser *browser, nd = browser->top; goto do_offset;case SEEK_END : - nd =hists__filter_prev_entries (rb_last (browser->entries), - hb->min_pcnt); + nd =rb_hierarchy_last (rb_last (browser->entries)); + nd =hists__filter_prev_entries (nd, hb->min_pcnt); first = false;break ;default :
@@ -1445,7 +1594,7 @@ do_offset:if (offset >0 ) { do { h = rb_entry(nd, struct hist_entry, rb_node); - if (h->unfolded) { + if (h->unfolded && h->leaf) { u16 remaining = h->nr_rows - h->row_offset; if (offset > remaining) { offset -= remaining;
@@ -1457,7 +1606,8 @@ do_offset:break ; } } - nd =hists__filter_entries (rb_next (nd), hb->min_pcnt); + nd =hists__filter_entries (rb_hierarchy_next (nd), + hb->min_pcnt);if (nd ==NULL )break ; --offset;
@@ -1466,7 +1616,7 @@ do_offset: }else if (offset <0 ) {while (1 ) { h = rb_entry(nd, struct hist_entry, rb_node); -if (h->unfolded) { +if (h->unfolded && h->leaf) {if (first) {if (-offset > h->row_offset) { offset += h->row_offset;
@@ -1490,7 +1640,7 @@ do_offset: } } - nd =hists__filter_prev_entries (rb_prev (nd), + nd =hists__filter_prev_entries (rb_hierarchy_prev (nd), hb->min_pcnt);if (nd ==NULL )break ;
@@ -1503,7 +1653,7 @@ do_offset:* row_offset at its last entry. */ h = rb_entry(nd, struct hist_entry, rb_node); -if (h->unfolded) +if (h->unfolded && h->leaf) h->row_offset = h->nr_rows;break ; }
@@ -1517,13 +1667,14 @@ do_offset: }static int hist_browser__fprintf_callchain (struct hist_browser *browser, -struct hist_entry *he,FILE *fp) +struct hist_entry *he,FILE *fp, +int level) {struct callchain_print_arg arg = { .fp = fp, }; -hist_browser__show_callchain (browser, he,1 ,0 , +hist_browser__show_callchain (browser, he, level,0 , hist_browser__fprintf_callchain_entry, &arg, hist_browser__check_dump_full);return arg.printed;
@@ -1566,7 +1717,65 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser, printed +=fprintf (fp,"%s\n" , s);if (folded_sign =='-' ) - printed +=hist_browser__fprintf_callchain (browser, he, fp); + printed +=hist_browser__fprintf_callchain (browser, he, fp,1 ); + +return printed; +} + + +static int hist_browser__fprintf_hierarchy_entry (struct hist_browser *browser, +struct hist_entry *he, +FILE *fp,int level, +int nr_sort_keys) +{ +char s[8192 ]; +int printed =0 ; +char folded_sign =' ' ; +struct perf_hpp hpp = { + .buf = s, + .size =sizeof (s), + }; +struct perf_hpp_fmt *fmt; +bool first = true; +int ret; +int hierarchy_indent = (nr_sort_keys +1 ) *HIERARCHY_INDENT ; + + printed =fprintf (fp,"%*s" , level *HIERARCHY_INDENT ,"" ); + + folded_sign =hist_entry__folded (he); + printed +=fprintf (fp,"%c" , folded_sign); + +hists__for_each_format (he->hists, fmt) { +if (perf_hpp__should_skip (fmt, he->hists)) +continue ; + +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (!first) { + ret =scnprintf (hpp.buf, hpp.size," " ); +advance_hpp (&hpp, ret); + }else + first = false; + + ret = fmt->entry (fmt, &hpp, he); +advance_hpp (&hpp, ret); + } + + ret =scnprintf (hpp.buf, hpp.size,"%*s" , hierarchy_indent,"" ); +advance_hpp (&hpp, ret); + + fmt = he->fmt; + ret = fmt->entry (fmt, &hpp, he); +advance_hpp (&hpp, ret); + + printed +=fprintf (fp,"%s\n" ,rtrim (s)); + +if (he->leaf && folded_sign =='-' ) { + printed +=hist_browser__fprintf_callchain (browser, he, fp, + he->depth +1 ); + }return printed; }
@@ -1576,12 +1785,22 @@ static int hist_browser__fprintf(struct hist_browser *browser, FILE *fp)struct rb_node *nd =hists__filter_entries (rb_first (browser->b.entries), browser->min_pcnt);int printed =0 ; +int nr_sort = browser->hists->hpp_list->nr_sort_keys;while (nd) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); - printed +=hist_browser__fprintf_entry (browser, h, fp); - nd =hists__filter_entries (rb_next (nd), browser->min_pcnt); +if (symbol_conf.report_hierarchy) { + printed +=hist_browser__fprintf_hierarchy_entry (browser, + h, fp, + h->depth, + nr_sort); + }else { + printed +=hist_browser__fprintf_entry (browser, h, fp); + } + + nd =hists__filter_entries (rb_hierarchy_next (nd), + browser->min_pcnt); }return printed;
@@ -2149,12 +2368,12 @@ static void hist_browser__update_percent_limit(struct hist_browser *hb, hb->min_pcnt = callchain_param.min_percent = percent; -if (!symbol_conf.use_callchain) -return ; -while ((nd =hists__filter_entries (nd, hb->min_pcnt)) !=NULL ) { he = rb_entry(nd, struct hist_entry, rb_node); +if (!he->leaf || !symbol_conf.use_callchain) + goto next; +if (callchain_param.mode ==CHAIN_GRAPH_REL ) { total = he->stat.period;
@@ -2167,11 +2386,17 @@ static void hist_browser__update_percent_limit(struct hist_browser *hb, callchain_param.sort (&he->sorted_chain, he->callchain, min_callchain_hits, &callchain_param); +next: +/* +* Tentatively set unfolded so that the rb_hierarchy_next() +* can toggle children of folded entries too. +*/ + he->unfolded = he->has_children; + nd =rb_hierarchy_next (nd); +/* force to re-evaluate folding state of callchains */ he->init_have_children = false;hist_entry__set_folding (he, hb, false); - - nd =rb_next (nd); } }
Signature · 1 line
2.7.1
Re: [PATCH v6 20/25] perf hists browser: Implement hierarchy output
Quoted 22 lines · Namhyung Kim
Implement hierarchy mode in TUI. The output is look like stdio but it also supports to fold/unfold children dynamically.
Acked-by Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/ui/browsers/hists.c | 269 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 247 insertions(+), 22 deletions(-)tools/perf/ui/browsers/hists.c +5
-0@@ -1260,6 +1260,137 @@ static int hist_browser__show_entry(struct hist_browser *browser,return printed; } +static int hist_browser__show_hierarchy_entry (struct hist_browser *browser, +struct hist_entry *entry, +unsigned short row, +int level,int nr_sort_keys) +{
SNIP
Quoted 23 lines
tools/perf/ui/browsers/hists.c +23
-0+ +hists__for_each_format (entry->hists, fmt) { +if (perf_hpp__should_skip (fmt, entry->hists) || + column++ < browser->b.horiz_scroll) +continue ; + +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (current_entry && browser->b.navkeypressed) { +ui_browser__set_color (&browser->b, +HE_COLORSET_SELECTED ); + }else { +ui_browser__set_color (&browser->b, +HE_COLORSET_NORMAL ); + } + +if (first) { +ui_browser__printf (&browser->b,"%c" , folded_sign); + width--; + first = false; + }else {
tools/perf/ui/browsers/hists.c static int hist_browser__show_entry(struct hist_browser *browser, · line 1343
Quoted 10 lines
tools/perf/ui/browsers/hists.c +10
-0+ui_browser__printf (&browser->b," " ); + width -=2 ; + } + +if (fmt->color) { + width -= fmt->color (fmt, &hpp, entry); + }else { + width -= fmt->entry (fmt, &hpp, entry); +ui_browser__printf (&browser->b,"%s" , s); + }
same as for stdio patch comment, you might want to use hist_entry__snprintf_alignment in here
jirka
Namhyung Kim
maintainerPATCH v6 21/25 perf hists browser: Align column header in hierarchy mode
In reply to Namhyung KimLike in stdio, fit column header to hierarchy output. Merge column headers with "/" as a separator.
Overhead Command / Shared Object / Symbol
...
+ 0.09% dwm + 0.06% emacs - 0.05% perf
- 0.05% [kernel.vmlinux]
+ 0.03% [k] memcpy_orig
+ 0.01% [k] unmap_single_vma
+ 0.01% [k] smp_call_function_single
+ 0.00% [k] native_irq_return_iret
+ 0.00% [k] arch_trigger_all_cpu_backtrace_handler
+ 0.00% [k] native_write_msr_safe
--- tools/perf/ui/browsers/hists.c | 69 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +68 -1
@@ -1430,11 +1430,78 @@ static int hists_browser__scnprintf_headers(struct hist_browser *browser, char *return ret; } +static int hists_browser__scnprintf_hierarchy_headers (struct hist_browser *browser,char *buf,size_t size) +{ +struct hists *hists = browser->hists; +struct perf_hpp dummy_hpp = { + .buf = buf, + .size = size, + }; +struct perf_hpp_fmt *fmt; +size_t ret =0 ; +int column =0 ; +int nr_sort_keys = hists->hpp_list->nr_sort_keys; +bool first = true; + + ret =scnprintf (buf, size," " ); +if (advance_hpp_check (&dummy_hpp, ret)) +return ret; + +hists__for_each_format (hists, fmt) { +if (column++ < browser->b.horiz_scroll) +continue ; + +if (perf_hpp__is_sort_entry (fmt) ||perf_hpp__is_dynamic_entry (fmt)) +break ; + + ret = fmt->header (fmt, &dummy_hpp,hists_to_evsel (hists)); +if (advance_hpp_check (&dummy_hpp, ret)) +break ; + + ret =scnprintf (dummy_hpp.buf, dummy_hpp.size," " ); +if (advance_hpp_check (&dummy_hpp, ret)) +break ; + } + + ret =scnprintf (dummy_hpp.buf, dummy_hpp.size,"%*s" , + (nr_sort_keys -1 ) *HIERARCHY_INDENT ,"" ); +if (advance_hpp_check (&dummy_hpp, ret)) +return ret; + +hists__for_each_format (hists, fmt) { +if (!perf_hpp__is_sort_entry (fmt) && !perf_hpp__is_dynamic_entry (fmt)) +continue ; + +if (first) { + first = false; + }else { + ret =scnprintf (dummy_hpp.buf, dummy_hpp.size," / " ); +if (advance_hpp_check (&dummy_hpp, ret)) +break ; + } + + ret = fmt->header (fmt, &dummy_hpp,hists_to_evsel (hists)); + dummy_hpp.buf[ret] ='\0' ; +rtrim (dummy_hpp.buf); + + ret =strlen (dummy_hpp.buf); +if (advance_hpp_check (&dummy_hpp, ret)) +break ; + } + +return ret; +} +static void hist_browser__show_headers (struct hist_browser *browser) {char headers[1024 ]; -hists_browser__scnprintf_headers (browser, headers,sizeof (headers)); +if (symbol_conf.report_hierarchy) +hists_browser__scnprintf_hierarchy_headers (browser, headers, +sizeof (headers)); +else +hists_browser__scnprintf_headers (browser, headers, +sizeof (headers));ui_browser__gotorc (&browser->b,0 ,0 );ui_browser__set_color (&browser->b,HE_COLORSET_ROOT );ui_browser__write_nstring (&browser->b, headers, browser->b.width +1 );
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 22/25 perf ui/gtk: Implement hierarchy output mode
In reply to Namhyung KimThe hierarchy output mode is to group entries for each level so that user can see higher level picture more easily.
--- tools/perf/ui/gtk/hists.c | 161 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-)
tools/perf/ui/gtk/hists.c +160 -1
@@ -396,6 +396,162 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,gtk_container_add (GTK_CONTAINER (window), view); } +static void perf_gtk__add_hierarchy_entries (struct hists *hists, +struct rb_root *root, +GtkTreeStore *store, +GtkTreeIter *parent, +struct perf_hpp *hpp, +float min_pcnt) +{ +int col_idx =0 ; +struct rb_node *node; +struct hist_entry *he; +struct perf_hpp_fmt *fmt; +u64 total =hists__total_period (hists); + +for (node =rb_first (root); node; node =rb_next (node)) { +GtkTreeIter iter; +float percent; + + he = rb_entry(node, struct hist_entry, rb_node); +if (he->filtered) +continue ; + + percent =hist_entry__get_percent_limit (he); +if (percent < min_pcnt) +continue ; + +gtk_tree_store_append (store, &iter, parent); + + col_idx =0 ; +hists__for_each_format (hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + +if (fmt->color) + fmt->color (fmt, hpp, he); +else + fmt->entry (fmt, hpp, he); + +gtk_tree_store_set (store, &iter, col_idx++, hpp->buf,-1 ); + } + + fmt = he->fmt; +if (fmt->color) + fmt->color (fmt, hpp, he); +else + fmt->entry (fmt, hpp, he); + +gtk_tree_store_set (store, &iter, col_idx,rtrim (hpp->buf),-1 ); + +if (!he->leaf) { +perf_gtk__add_hierarchy_entries (hists, &he->hroot_out, + store, &iter, hpp, + min_pcnt); + } + +if (symbol_conf.use_callchain && he->leaf) { +if (callchain_param.mode ==CHAIN_GRAPH_REL ) + total = symbol_conf.cumulate_callchain ? + he->stat_acc->period : he->stat.period; + +perf_gtk__add_callchain (&he->sorted_chain, store, &iter, + col_idx, total); + } + } + +} + +static void perf_gtk__show_hierarchy (GtkWidget *window,struct hists *hists, +float min_pcnt) +{ +struct perf_hpp_fmt *fmt; +GType col_types[MAX_COLUMNS ]; +GtkCellRenderer *renderer; +GtkTreeStore *store; +GtkWidget *view; +int col_idx; +int nr_cols =0 ; +char s[512 ]; +char buf[512 ]; +bool first = true; +struct perf_hpp hpp = { + .buf = s, + .size =sizeof (s), + }; + +hists__for_each_format (hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + + col_types[nr_cols++] =G_TYPE_STRING ; + } + col_types[nr_cols++] =G_TYPE_STRING ; + + store =gtk_tree_store_newv (nr_cols, col_types); + view =gtk_tree_view_new (); + renderer =gtk_cell_renderer_text_new (); + + col_idx =0 ; +hists__for_each_format (hists, fmt) { +if (perf_hpp__is_sort_entry (fmt) || +perf_hpp__is_dynamic_entry (fmt)) +break ; + +gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), +-1 , fmt->name, + renderer,"markup" , + col_idx++,NULL ); + } + +/* construct merged column header since sort keys share single column */ + buf[0 ] ='\0' ; +hists__for_each_format (hists ,fmt) { +if (!perf_hpp__is_sort_entry (fmt) && + !perf_hpp__is_dynamic_entry (fmt)) +continue ; + +if (first) + first = false; +else +strcat (buf," / " ); + + fmt->header (fmt, &hpp,hists_to_evsel (hists)); +strcat (buf,rtrim (hpp.buf)); + } + +gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), +-1 , buf, + renderer,"markup" , + col_idx++,NULL ); + +for (col_idx =0 ; col_idx < nr_cols; col_idx++) { +GtkTreeViewColumn *column; + + column =gtk_tree_view_get_column (GTK_TREE_VIEW (view), col_idx); +gtk_tree_view_column_set_resizable (column, TRUE); + +if (col_idx ==0 ) { +gtk_tree_view_set_expander_column (GTK_TREE_VIEW (view), + column); + } + } + +gtk_tree_view_set_model (GTK_TREE_VIEW (view),GTK_TREE_MODEL (store)); +g_object_unref (GTK_TREE_MODEL (store)); + +perf_gtk__add_hierarchy_entries (hists, &hists->entries, store, +NULL , &hpp, min_pcnt); + +gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE); + +g_signal_connect (view,"row-activated" , +G_CALLBACK (on_row_activated),NULL ); +gtk_container_add (GTK_CONTAINER (window), view); +} + int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, const char *help, struct hist_browser_timer *hbt __maybe_unused,
@@ -463,7 +619,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,GTK_POLICY_AUTOMATIC , GTK_POLICY_AUTOMATIC); -perf_gtk__show_hists (scrolled_window, hists, min_pcnt); +if (symbol_conf.report_hierarchy) +perf_gtk__show_hierarchy (scrolled_window, hists, min_pcnt); +else +perf_gtk__show_hists (scrolled_window, hists, min_pcnt); tab_label =gtk_label_new (evname);
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 23/25 perf report: Add --hierarchy option
In reply to Namhyung KimThe --hierarchy option is to show output in hierarchy mode. It extends folding/unfolding in the TUI and GTK browsers to support sort items as well as callchains. Users can toggle the items to see the performance result at wanted level.
$ perf report --hierarchy --tui
Overhead Command / Shared Object / Symbol
+ 32.96% gnome-shell
- 15.11% swapper
- 14.97% [kernel.vmlinux]
6.82% [k] intel_idle
0.66% [k] menu_select
0.43% [k] __hrtimer_start_range_ns
...--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/Documentation/tips.txt | 1 + tools/perf/builtin-report.c | 17 +++++++++++++++++ 3 files changed, 21 insertions(+)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -401,6 +401,9 @@ include::itrace.txt[] --raw-trace:: When displaying traceevent output, do not use print fmt or plugins. +--hierarchy:: + Enable hierarchical output. + include::callchain-overhead-calculation.txt[] SEE ALSO
tools/perf/Documentation/tips.txt +1 -0
@@ -27,3 +27,4 @@ Skip collecing build-id when recording: perf record -B To change sampling frequency to 100 Hz: perf record -F 100 See assembly instructions with percentage: perf annotate <symbol> If you prefer Intel style assembly, try: perf annotate -M intel +For hierarchical output, try: perf report --hierarchy
tools/perf/builtin-report.c +17 -0
@@ -811,6 +811,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) "only show processor socket that match with this filter"),OPT_BOOLEAN (0 ,"raw-trace" , &symbol_conf.raw_trace,"Show raw trace event output (do not use print fmt or plugins)" ), +OPT_BOOLEAN (0 ,"hierarchy" , &symbol_conf.report_hierarchy, +"Show entries in a hierarchy" ),OPT_END () }; struct perf_data_file file = {
@@ -920,6 +922,21 @@ repeat: symbol_conf.cumulate_callchain = false; } +if (symbol_conf.report_hierarchy) { +/* disable incompatible options */ + symbol_conf.event_group = false; + symbol_conf.cumulate_callchain = false; + +if (field_order) { +pr_err ("Error: --hierarchy and --fields options cannot be used together\n" ); +parse_options_usage (report_usage, options,"F" ,1 ); +parse_options_usage (NULL , options,"hierarchy" ,0 ); + goto error; + } + + sort__need_collapse = true; + } +/* Force tty output for header output and per-thread stat. */ if (report.header || report.header_only || report.show_threads) use_browser =0 ;
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 24/25 perf hists: Support decaying in hierarchy mode
In reply to Namhyung KimIn the hierarchy mode, hist entries should decay their children too. Also update hists__delete_entry() to be able to free child entries.
--- tools/perf/util/hist.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-)
tools/perf/util/hist.c +34 -8
@@ -245,6 +245,8 @@ static void he_stat__decay(struct he_stat *he_stat)/* XXX need decay for weight too? */ } +static void hists__delete_entry (struct hists *hists,struct hist_entry *he); +static bool hists__decay_entry (struct hists *hists,struct hist_entry *he) {u64 prev_period = he->stat.period;
@@ -260,21 +262,45 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he) diff = prev_period - he->stat.period; - hists->stats.total_period -= diff; -if (!he->filtered) - hists->stats.total_non_filtered_period -= diff; +if (!he->depth) { + hists->stats.total_period -= diff; +if (!he->filtered) + hists->stats.total_non_filtered_period -= diff; + } + +if (!he->leaf) { +struct hist_entry *child; +struct rb_node *node =rb_first (&he->hroot_out); +while (node) { + child = rb_entry(node, struct hist_entry, rb_node); + node =rb_next (node); + +if (hists__decay_entry (hists, child)) +hists__delete_entry (hists, child); + } + }return he->stat.period ==0 ; }static void hists__delete_entry (struct hists *hists,struct hist_entry *he) { -rb_erase (&he->rb_node, &hists->entries); +struct rb_root *root_in; +struct rb_root *root_out; -if (sort__need_collapse) -rb_erase (&he->rb_node_in, &hists->entries_collapsed); -else -rb_erase (&he->rb_node_in, hists->entries_in); +if (he->parent_he) { + root_in = &he->parent_he->hroot_in; + root_out = &he->parent_he->hroot_out; + }else { +if (sort__need_collapse) + root_in = &hists->entries_collapsed; +else + root_in = hists->entries_in; + root_out = &hists->entries; + } + +rb_erase (&he->rb_node_in, root_in); +rb_erase (&he->rb_node, root_out); --hists->nr_entries;if (!he->filtered)
Signature · 1 line
2.7.1
Namhyung Kim
maintainerPATCH v6 25/25 perf top: Add --hierarchy option
In reply to Namhyung KimSupport hierarchy output for perf-top using --hierarchy option.
--- tools/perf/Documentation/perf-top.txt | 3 +++ tools/perf/builtin-top.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+)
tools/perf/Documentation/perf-top.txt +3 -0
@@ -233,6 +233,9 @@ Default is to monitor all CPUS. --raw-trace:: When displaying traceevent output, do not use print fmt or plugins. +--hierarchy:: + Enable hierarchy output. + INTERACTIVE PROMPTING KEYS --------------------------
tools/perf/builtin-top.c +15 -0
@@ -1214,6 +1214,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) parse_branch_stack),OPT_BOOLEAN (0 ,"raw-trace" , &symbol_conf.raw_trace,"Show raw trace event output (do not use print fmt or plugins)" ), +OPT_BOOLEAN (0 ,"hierarchy" , &symbol_conf.report_hierarchy, +"Show entries in a hierarchy" ),OPT_END () }; const char * const top_usage[] = {
@@ -1241,6 +1243,19 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) goto out_delete_evlist; } +if (symbol_conf.report_hierarchy) { +/* disable incompatible options */ + symbol_conf.event_group = false; + symbol_conf.cumulate_callchain = false; + +if (field_order) { +pr_err ("Error: --hierarchy and --fields options cannot be used together\n" ); +parse_options_usage (top_usage, options,"fields" ,0 ); +parse_options_usage (NULL , options,"hierarchy" ,0 ); + goto out_delete_evlist; + } + } + sort__mode =SORT_MODE__TOP ;/* display thread wants entries to be collapsed in a different tree */ sort__need_collapse =1 ;
Signature · 1 line
2.7.1
Re: [PATCH v6 25/25] perf top: Add --hierarchy option
Quoted 28 lines · Namhyung Kim
Support hierarchy output for perf-top using --hierarchy option.
Acked-by Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/Documentation/perf-top.txt | 3 +++ tools/perf/builtin-top.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+)tools/perf/Documentation/perf-top.txt +3
-0@@ -233,6 +233,9 @@ Default is to monitor all CPUS. --raw-trace:: When displaying traceevent output, do not use print fmt or plugins. +--hierarchy:: + Enable hierarchy output. + INTERACTIVE PROMPTING KEYS --------------------------tools/perf/builtin-top.c +0
-0
tools/perf/builtin-top.c int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) · line 1218
Quoted 5 lines
tools/perf/builtin-top.c +2
-0@@ -1214,6 +1214,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) parse_branch_stack),OPT_BOOLEAN (0 ,"raw-trace" , &symbol_conf.raw_trace,"Show raw trace event output (do not use print fmt or plugins)" ), +OPT_BOOLEAN (0 ,"hierarchy" , &symbol_conf.report_hierarchy, + "Show entries in a hierarchy"),
hum, I'm not getting --children (default) output with hierarchy?
I can't see this was intentional.. haven't found the reason yet
thanks,
jirka
Namhyung Kim
maintainerRe: [PATCH v6 25/25] perf top: Add --hierarchy option
Quoted 37 lines · Jiri Olsa
Quoted 28 lines · Namhyung Kim
Support hierarchy output for perf-top using --hierarchy option.
Acked-by Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/Documentation/perf-top.txt | 3 +++ tools/perf/builtin-top.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+)tools/perf/Documentation/perf-top.txt +3
-0@@ -233,6 +233,9 @@ Default is to monitor all CPUS. --raw-trace:: When displaying traceevent output, do not use print fmt or plugins. +--hierarchy:: + Enable hierarchy output. + INTERACTIVE PROMPTING KEYS --------------------------tools/perf/builtin-top.c +0
-0tools/perf/builtin-top.c int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) · line 1218
Quoted 5 lines
tools/perf/builtin-top.c +2
-0@@ -1214,6 +1214,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) parse_branch_stack),OPT_BOOLEAN (0 ,"raw-trace" , &symbol_conf.raw_trace,"Show raw trace event output (do not use print fmt or plugins)" ), +OPT_BOOLEAN (0 ,"hierarchy" , &symbol_conf.report_hierarchy, + "Show entries in a hierarchy"),hum, I'm not getting --children (default) output with hierarchy?
Quoted 1 line
I can't see this was intentional.. haven't found the reason yet
Currently the hierarchy mode disables the children mode. This is for simplicity and I didn't test the combination thoroughly although it would work. Maybe we can remove the restriction later, but I think it'd be better to start with a simple choice.
Thanks,
Namhyung