perf report: Add support for event group view (v9)
Namhyung Kim
maintainercover perf report: Add support for event group view (v9)
Hello,
This is a 9th attempt to enable event group view support to perf report.
The basic idea is link group member's hist entries to a leader so that they can be shown with leader's output together. The output is sorted by the leader's period and in turn first group member's and so on.
To use it, 'perf record' should group events when recording. And then perf report parses the saved group relation from file header and prints them together if --group option is provided. You can use 'perf evlist' command to see event group information:
$ perf record -e '{ref-cycles,cycles}' noploop 1
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.385 MB perf.data (~16807 samples) ] $ perf evlist --group
{ref-cycles,cycles}With this example, default perf report will show you each event separately like this:
$ perf report
...
# group: {ref-cycles,cycles}
# ========
#
# Samples: 3K of event 'ref-cycles'
# Event count (approx.): 3153797218
#
# Overhead Command Shared Object Symbol
# ........ ....... ................. ..........................
#
99.84% noploop noploop [.] main
0.07% noploop ld-2.15.so [.] strcmp
0.03% noploop [kernel.kallsyms] [k] timerqueue_del
0.03% noploop [kernel.kallsyms] [k] sched_clock_cpu
0.02% noploop [kernel.kallsyms] [k] account_user_time
0.01% noploop [kernel.kallsyms] [k] __alloc_pages_nodemask
0.00% noploop [kernel.kallsyms] [k] native_write_msr_safe # Samples: 3K of event 'cycles'
# Event count (approx.): 3722310525
#
# Overhead Command Shared Object Symbol
# ........ ....... ................. .........................
#
99.76% noploop noploop [.] main
0.11% noploop [kernel.kallsyms] [k] _raw_spin_lock
0.06% noploop [kernel.kallsyms] [k] find_get_page
0.03% noploop [kernel.kallsyms] [k] sched_clock_cpu
0.02% noploop [kernel.kallsyms] [k] rcu_check_callbacks
0.02% noploop [kernel.kallsyms] [k] __current_kernel_time
0.00% noploop [kernel.kallsyms] [k] native_write_msr_safeIn this case the event group information will be shown in the end of header area. So you can use --group option to enable event group view.
$ perf report --group
...
# group: {ref-cycles,cycles}
# ========
#
# Samples: 7K of event 'anon group { ref-cycles, cycles }'
# Event count (approx.): 6876107743
#
# Overhead Command Shared Object Symbol
# ................ ....... ................. ..........................
#
99.84% 99.76% noploop noploop [.] main
0.07% 0.00% noploop ld-2.15.so [.] strcmp
0.03% 0.00% noploop [kernel.kallsyms] [k] timerqueue_del
0.03% 0.03% noploop [kernel.kallsyms] [k] sched_clock_cpu
0.02% 0.00% noploop [kernel.kallsyms] [k] account_user_time
0.01% 0.00% noploop [kernel.kallsyms] [k] __alloc_pages_nodemask
0.00% 0.00% noploop [kernel.kallsyms] [k] native_write_msr_safe
0.00% 0.11% noploop [kernel.kallsyms] [k] _raw_spin_lock
0.00% 0.06% noploop [kernel.kallsyms] [k] find_get_page
0.00% 0.02% noploop [kernel.kallsyms] [k] rcu_check_callbacks
0.00% 0.02% noploop [kernel.kallsyms] [k] __current_kernel_time As you can see the Overhead column now contains both of ref-cycles and cycles and header line shows group information also - 'anon group { ref-cycles, cycles }'. The output is sorted by period of group leader first.
If perf.data file doesn't contain group information, this --group option does nothing. So if you want enable event group view by default you can set it in ~/.perfconfig file:
$ cat ~/.perfconfig [report] group = true
It can be overridden with command line if you want:
$ perf report --no-group
You can also get this on my 'perf/group-v9' branch in
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Any comments are welcome, thanks.
Namhyung
v8 -> v9:
* split patches have multiple changes (Arnaldo)
* add --group option to perf evlist (Arnaldo)
v7 -> v8:
* rebase onto acme/perf/core
* patch 3 in the previous version is merged
* add Jiri's Acked-by's
v6 -> v7:
* hists__{match,link} changes are merged separately
* factor out inc_group_count() from parsing group_def (Jiri)
* add checking for group fields in evlist/evsel (Jiri)
* check return value of during header processing (Arnaldo)
* get rid of a temporal array in hpp functions (Arnaldo)
* convert hpp macros to static inline functions (Jiri)
v5 -> v6:
* set ->leader alse for leader evsel (Arnaldo)
* use hists__{match,link} (Arnaldo)
v4 -> v5:
* rebase onto acme/perf/core
v3 -> v4:
* patch 1-9 in previous post are merged.
* add Jiri's Acked-by
* add report.group config option
v2 -> v3:
* drop patch 1 since it's merged into acme/perf/core
* cherry-pick Jiri's hpp changes
* add missing bswap_32 on reading nr_groups (Jiri)
* remove perf_evlist__recalc_nr_groups() in favor of list_is_last (Jiri)
v1 -> v2:
* save group relation to header (Jiri)
Namhyung Kim (19):
perf tools: Keep group information
perf tests: Add group test conditions
perf header: Add HEADER_GROUP_DESC feature
perf report: Make another loop for linking group hists perf hists: Resort hist entries using group members for output perf ui/hist: Consolidate hpp helpers
perf hist browser: Convert hpp helpers to a function
perf gtk/browser: Convert hpp helpers to a function
perf ui/hist: Add support for event group view
perf hist browser: Move coloring logic to hpp functions perf hist browser: Add suppport for event group view
perf gtk/browser: Add support for event group view
perf tools: Move ltrim() to util/string.c
perf gtk/browser: Trim column header string when event group enabled perf report: Bypass non-leader events when event group is enabled perf report: Show group description when event group is enabled perf report: Add --group option
perf report: Add report.group config option
perf evlist: Add --group option
tools/perf/Documentation/perf-evlist.txt | 4 + tools/perf/Documentation/perf-report.txt | 3 + tools/perf/builtin-evlist.c | 7 + tools/perf/builtin-record.c | 3 + tools/perf/builtin-report.c | 47 ++++- tools/perf/builtin-script.c | 12 -- tools/perf/tests/parse-events.c | 28 +++ tools/perf/ui/browsers/hists.c | 217 ++++++++++++++++++---- tools/perf/ui/gtk/hists.c | 130 ++++++++++--- tools/perf/ui/hist.c | 306 +++++++++++++++---------------- tools/perf/ui/stdio/hist.c | 2 + tools/perf/util/evlist.c | 7 +- tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 49 ++++- tools/perf/util/evsel.h | 16 ++ tools/perf/util/header.c | 164 +++++++++++++++++ tools/perf/util/header.h | 2 + tools/perf/util/hist.c | 59 +++++- tools/perf/util/parse-events.c | 1 + tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 10 + tools/perf/util/string.c | 18 ++ tools/perf/util/symbol.h | 3 +- tools/perf/util/util.h | 1 + 24 files changed, 855 insertions(+), 236 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/19 perf tools: Keep group information
From: Namhyung Kim <[email protected]>
Add a few of group-related field in struct perf_{evlist,evsel} so that the group information in a evlist can be known easily. It only counts groups which have more than 1 members since leader-only groups are treated as non-group events.
--- tools/perf/util/evlist.c | 7 ++++++- tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 1 + tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 10 ++++++++++ 6 files changed, 25 insertions(+), 1 deletion(-)
tools/perf/util/evlist.c +6 -1
@@ -117,6 +117,9 @@ void __perf_evlist__set_leader(struct list_head *list)struct perf_evsel *evsel, *leader; leader = list_entry(list->next, struct perf_evsel, node); + evsel = list_entry(list->prev, struct perf_evsel, node); + + leader->nr_members = evsel->idx - leader->idx +1 ;list_for_each_entry (evsel, list, node) {if (evsel != leader)
@@ -126,8 +129,10 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct perf_evlist *evlist) { -if (evlist->nr_entries) +if (evlist->nr_entries) { + evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ;__perf_evlist__set_leader (&evlist->entries); + } }int perf_evlist__add_default (struct perf_evlist *evlist)
tools/perf/util/evlist.h +1 -0
@@ -21,6 +21,7 @@ struct perf_evlist {struct list_head entries;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ];int nr_entries; +int nr_groups;int nr_fds;int nr_mmaps;int mmap_len;
tools/perf/util/evsel.h +6 -0
@@ -73,6 +73,7 @@ struct perf_evsel {bool needs_swap;/* parse modifier helper */ int exclude_GH; +int nr_members;struct perf_evsel *leader;char *group_name; };
@@ -257,4 +258,9 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,int perf_evsel__open_strerror (struct perf_evsel *evsel,struct perf_target *target,int err,char *msg,size_t size); + +static inline int perf_evsel__group_idx (struct perf_evsel *evsel) +{ +return evsel->idx - evsel->leader->idx; +}#endif /* __PERF_EVSEL_H */
tools/perf/util/parse-events.c +1 -0
@@ -884,6 +884,7 @@ int parse_events(struct perf_evlist *evlist, const char *str)if (!ret) {int entries = data.idx - evlist->nr_entries;perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups;return 0 ; }
tools/perf/util/parse-events.h +1 -0
@@ -64,6 +64,7 @@ struct parse_events__term {struct parse_events_data__events {struct list_head list;int idx; +int nr_groups; };struct parse_events_data__terms {
tools/perf/util/parse-events.y +10 -0
@@ -23,6 +23,14 @@ do { \ YYABORT; \ } while (0) +static inc_group_count(struct list_head *list, + struct parse_events_data__events *data) +{ + /* Count groups only have more than 1 members */ + if (!list_is_last(list->next, list)) + data->nr_groups++; +} + %} %token PE_START_EVENTS PE_START_TERMS
@@ -123,6 +131,7 @@ PE_NAME '{' events '}' { struct list_head *list = $3; + inc_group_count(list, _data); parse_events__set_leader($1, list); $$ = list; }
@@ -131,6 +140,7 @@ PE_NAME '{' events '}' { struct list_head *list = $2; + inc_group_count(list, _data); parse_events__set_leader(NULL, list); $$ = list; }
Signature · 1 line
1.7.11.7
[tip:perf/core] perf tools: Keep group information
Commit-ID: 97f63e4a2cf88e9d7bc086a1c3f10fa41c9174df Gitweb: http://git.kernel.org/tip/97f63e4a2cf88e9d7bc086a1c3f10fa41c9174df Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:29 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:43 -0300
perf tools: Keep group information
Add a few of group-related field in struct perf_{evlist,evsel} so that the group information in a evlist can be known easily. It only counts groups which have more than 1 members since leader-only groups are treated as non-group events.
--- tools/perf/util/evlist.c | 7 ++++++- tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 1 + tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 10 ++++++++++ 6 files changed, 25 insertions(+), 1 deletion(-)
tools/perf/util/evlist.c +6 -1
@@ -117,6 +117,9 @@ void __perf_evlist__set_leader(struct list_head *list)struct perf_evsel *evsel, *leader; leader = list_entry(list->next, struct perf_evsel, node); + evsel = list_entry(list->prev, struct perf_evsel, node); + + leader->nr_members = evsel->idx - leader->idx +1 ;list_for_each_entry (evsel, list, node) {if (evsel != leader)
@@ -126,8 +129,10 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct perf_evlist *evlist) { -if (evlist->nr_entries) +if (evlist->nr_entries) { + evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ;__perf_evlist__set_leader (&evlist->entries); + } }int perf_evlist__add_default (struct perf_evlist *evlist)
tools/perf/util/evlist.h +1 -0
@@ -21,6 +21,7 @@ struct perf_evlist {struct list_head entries;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ];int nr_entries; +int nr_groups;int nr_fds;int nr_mmaps;int mmap_len;
tools/perf/util/evsel.h +6 -0
@@ -74,6 +74,7 @@ struct perf_evsel {bool needs_swap;/* parse modifier helper */ int exclude_GH; +int nr_members;struct perf_evsel *leader;char *group_name; };
@@ -259,4 +260,9 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,int perf_evsel__open_strerror (struct perf_evsel *evsel,struct perf_target *target,int err,char *msg,size_t size); + +static inline int perf_evsel__group_idx (struct perf_evsel *evsel) +{ +return evsel->idx - evsel->leader->idx; +}#endif /* __PERF_EVSEL_H */
tools/perf/util/parse-events.c +1 -0
@@ -884,6 +884,7 @@ int parse_events(struct perf_evlist *evlist, const char *str)if (!ret) {int entries = data.idx - evlist->nr_entries;perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups;return 0 ; }
tools/perf/util/parse-events.h +1 -0
@@ -64,6 +64,7 @@ struct parse_events_term {struct parse_events_evlist {struct list_head list;int idx; +int nr_groups; };struct parse_events_terms {
tools/perf/util/parse-events.y +10 -0
@@ -23,6 +23,14 @@ do { \ YYABORT; \ } while (0) +static inc_group_count(struct list_head *list, + struct parse_events_evlist *data) +{ + /* Count groups only have more than 1 members */ + if (!list_is_last(list->next, list)) + data->nr_groups++; +} + %} %token PE_START_EVENTS PE_START_TERMS
@@ -123,6 +131,7 @@ PE_NAME '{' events '}' { struct list_head *list = $3; + inc_group_count(list, _data); parse_events__set_leader($1, list); $$ = list; }
@@ -131,6 +140,7 @@ PE_NAME '{' events '}' { struct list_head *list = $2; + inc_group_count(list, _data); parse_events__set_leader(NULL, list); $$ = list; }
Namhyung Kim
maintainerPATCH 2/19 perf tests: Add group test conditions
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
As some new fields for handling groups added, check them to be sure to have valid values in test__group* cases.
--- tools/perf/tests/parse-events.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
tools/perf/tests/parse-events.c +28 -0
@@ -23,6 +23,7 @@ static int test__checkevent_tracepoint(struct perf_evlist *evlist)struct perf_evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->nr_groups);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->attr.type);TEST_ASSERT_VAL ("wrong sample_type" ,PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
@@ -35,6 +36,7 @@ static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)struct perf_evsel *evsel;TEST_ASSERT_VAL ("wrong number of entries" , evlist->nr_entries >1 ); +TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->nr_groups);list_for_each_entry (evsel, &evlist->entries, node) { TEST_ASSERT_VAL("wrong type",
@@ -510,6 +512,7 @@ static int test__group1(struct perf_evlist *evlist)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* instructions:k */ evsel = leader =perf_evlist__first (evlist);
@@ -523,6 +526,8 @@ static int test__group1(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* cycles:upp */ evsel =perf_evsel__next (evsel);
@@ -537,6 +542,7 @@ static int test__group1(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );return 0 ; }
@@ -546,6 +552,7 @@ static int test__group2(struct perf_evlist *evlist)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,3 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* faults + :ku modifier */ evsel = leader =perf_evlist__first (evlist);
@@ -559,6 +566,8 @@ static int test__group2(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* cache-references + :u modifier */ evsel =perf_evsel__next (evsel);
@@ -572,6 +581,7 @@ static int test__group2(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles:k */ evsel =perf_evsel__next (evsel);
@@ -594,6 +604,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->nr_groups);/* group1 syscalls:sys_enter_open:H */ evsel = leader =perf_evlist__first (evlist);
@@ -610,6 +621,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group1" )); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* group1 cycles:kppp */ evsel =perf_evsel__next (evsel);
@@ -625,6 +638,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* group2 cycles + G modifier */ evsel = leader =perf_evsel__next (evsel);
@@ -640,6 +654,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group2" )); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* group2 1:3 + G modifier */ evsel =perf_evsel__next (evsel);
@@ -652,6 +668,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* instructions:u */ evsel =perf_evsel__next (evsel);
@@ -674,6 +691,7 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* cycles:u + p */ evsel = leader =perf_evlist__first (evlist);
@@ -689,6 +707,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==1 );TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions:kp + p */ evsel =perf_evsel__next (evsel);
@@ -703,6 +723,7 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );return 0 ; }
@@ -712,6 +733,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->nr_groups);/* cycles + G */ evsel = leader =perf_evlist__first (evlist);
@@ -726,6 +748,8 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions + G */ evsel =perf_evsel__next (evsel);
@@ -739,6 +763,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles:G */ evsel = leader =perf_evsel__next (evsel);
@@ -753,6 +778,8 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions:G */ evsel =perf_evsel__next (evsel);
@@ -766,6 +793,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles */ evsel =perf_evsel__next (evsel);
Signature · 1 line
1.7.11.7
[tip:perf/core] perf tests: Add group test conditions
Commit-ID: 8d7d8474d7b04dc89aa653d67425b61d3ff5c6f0 Gitweb: http://git.kernel.org/tip/8d7d8474d7b04dc89aa653d67425b61d3ff5c6f0 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:30 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:44 -0300
perf tests: Add group test conditions
As some new fields for handling groups added, check them to be sure to have valid values in test__group* cases.
--- tools/perf/tests/parse-events.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
tools/perf/tests/parse-events.c +28 -0
@@ -23,6 +23,7 @@ static int test__checkevent_tracepoint(struct perf_evlist *evlist)struct perf_evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->nr_groups);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->attr.type);TEST_ASSERT_VAL ("wrong sample_type" ,PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
@@ -35,6 +36,7 @@ static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)struct perf_evsel *evsel;TEST_ASSERT_VAL ("wrong number of entries" , evlist->nr_entries >1 ); +TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->nr_groups);list_for_each_entry (evsel, &evlist->entries, node) { TEST_ASSERT_VAL("wrong type",
@@ -510,6 +512,7 @@ static int test__group1(struct perf_evlist *evlist)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* instructions:k */ evsel = leader =perf_evlist__first (evlist);
@@ -523,6 +526,8 @@ static int test__group1(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* cycles:upp */ evsel =perf_evsel__next (evsel);
@@ -537,6 +542,7 @@ static int test__group1(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );return 0 ; }
@@ -546,6 +552,7 @@ static int test__group2(struct perf_evlist *evlist)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,3 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* faults + :ku modifier */ evsel = leader =perf_evlist__first (evlist);
@@ -559,6 +566,8 @@ static int test__group2(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* cache-references + :u modifier */ evsel =perf_evsel__next (evsel);
@@ -572,6 +581,7 @@ static int test__group2(struct perf_evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles:k */ evsel =perf_evsel__next (evsel);
@@ -594,6 +604,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->nr_groups);/* group1 syscalls:sys_enter_open:H */ evsel = leader =perf_evlist__first (evlist);
@@ -610,6 +621,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group1" )); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* group1 cycles:kppp */ evsel =perf_evsel__next (evsel);
@@ -625,6 +638,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* group2 cycles + G modifier */ evsel = leader =perf_evsel__next (evsel);
@@ -640,6 +654,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group2" )); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* group2 1:3 + G modifier */ evsel =perf_evsel__next (evsel);
@@ -652,6 +668,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* instructions:u */ evsel =perf_evsel__next (evsel);
@@ -674,6 +691,7 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->nr_groups);/* cycles:u + p */ evsel = leader =perf_evlist__first (evlist);
@@ -689,6 +707,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==1 );TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions:kp + p */ evsel =perf_evsel__next (evsel);
@@ -703,6 +723,7 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );return 0 ; }
@@ -712,6 +733,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)struct perf_evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->nr_entries); +TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->nr_groups);/* cycles + G */ evsel = leader =perf_evlist__first (evlist);
@@ -726,6 +748,8 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions + G */ evsel =perf_evsel__next (evsel);
@@ -739,6 +763,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles:G */ evsel = leader =perf_evsel__next (evsel);
@@ -753,6 +778,8 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel)); +TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 ); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );/* instructions:G */ evsel =perf_evsel__next (evsel);
@@ -766,6 +793,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); +TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles */ evsel =perf_evsel__next (evsel);
Namhyung Kim
maintainerPATCH 3/19 perf header: Add HEADER_GROUP_DESC feature
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Save group relationship information so that it can be restored when perf report is running.
--- tools/perf/builtin-record.c | 3 + tools/perf/util/header.c | 164 ++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/header.h | 2 + 3 files changed, 169 insertions(+)
tools/perf/builtin-record.c +3 -0
@@ -486,6 +486,9 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) goto out_delete_session; } +if (!evsel_list->nr_groups) +perf_header__clear_feat (&session->header,HEADER_GROUP_DESC ); +/* * perf_session__delete(session) will be called at perf_record__exit() */
tools/perf/util/header.c +164 -0
188 lines not on this page · raw message
tools/perf/util/header.h +2 -0
@@ -29,6 +29,7 @@ enum {HEADER_NUMA_TOPOLOGY ,HEADER_BRANCH_STACK ,HEADER_PMU_MAPPINGS , +HEADER_GROUP_DESC ,HEADER_LAST_FEATURE , HEADER_FEAT_BITS = 256, };
@@ -79,6 +80,7 @@ struct perf_session_env {char *numa_nodes;int nr_pmu_mappings;char *pmu_mappings; +int nr_groups; };struct perf_header {
Signature · 1 line
1.7.11.7
[tip:perf/core] perf header: Add HEADER_GROUP_DESC feature
Commit-ID: a8bb559bd4eff5c71601e2e61a4bd1deef44a03c Gitweb: http://git.kernel.org/tip/a8bb559bd4eff5c71601e2e61a4bd1deef44a03c Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:31 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:44 -0300
perf header: Add HEADER_GROUP_DESC feature
Save group relationship information so that it can be restored when perf report is running.
--- tools/perf/builtin-record.c | 3 + tools/perf/util/header.c | 164 ++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/header.h | 2 + 3 files changed, 169 insertions(+)
tools/perf/builtin-record.c +3 -0
@@ -486,6 +486,9 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) goto out_delete_session; } +if (!evsel_list->nr_groups) +perf_header__clear_feat (&session->header,HEADER_GROUP_DESC ); +/* * perf_session__delete(session) will be called at perf_record__exit() */
tools/perf/util/header.c +164 -0
188 lines not on this page · raw message
tools/perf/util/header.h +2 -0
@@ -29,6 +29,7 @@ enum {HEADER_NUMA_TOPOLOGY ,HEADER_BRANCH_STACK ,HEADER_PMU_MAPPINGS , +HEADER_GROUP_DESC ,HEADER_LAST_FEATURE , HEADER_FEAT_BITS = 256, };
@@ -79,6 +80,7 @@ struct perf_session_env {char *numa_nodes;int nr_pmu_mappings;char *pmu_mappings; +int nr_groups; };struct perf_header {
Namhyung Kim
maintainerPATCH 4/19 perf report: Make another loop for linking group hists
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Now the event grouping viewing requires linking all member hists in a group to the leader's. Thus hists__output_resort should be called after linking all events in evlist.
Introduce symbol_conf.event_group flag to determine whether the feature is enabled or not.
--- tools/perf/builtin-report.c | 13 ++++++++++++- tools/perf/util/symbol.h | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +12 -1
@@ -416,8 +416,16 @@ static int __cmd_report(struct perf_report *rep) hists->symbol_filter_str = rep->symbol_filter_str;hists__collapse_resort (hists); -hists__output_resort (hists); nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE ]; + +/* Non-group events are considered as leader */ +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) { +struct hists *leader_hists = &pos->leader->hists; + +hists__match (leader_hists, hists); +hists__link (leader_hists, hists); + } }if (nr_samples ==0 ) {
@@ -425,6 +433,9 @@ static int __cmd_report(struct perf_report *rep) goto out_delete; } +list_for_each_entry (pos, &session->evlist->entries, node) +hists__output_resort (&pos->hists); +if (use_browser >0 ) {if (use_browser ==1 ) { perf_evlist__tui_browse_hists(session->evlist, help,
tools/perf/util/symbol.h +2 -1
@@ -96,7 +96,8 @@ struct symbol_conf { initialized, kptr_restrict, annotate_asm_raw, - annotate_src; + annotate_src, + event_group;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Signature · 1 line
1.7.11.7
[tip:perf/core] perf report: Make another loop for linking group hists
Commit-ID: 6e1f601a10cbaa5cda869f844292dd81c519a8e7 Gitweb: http://git.kernel.org/tip/6e1f601a10cbaa5cda869f844292dd81c519a8e7 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:32 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:44 -0300
perf report: Make another loop for linking group hists
Now the event grouping viewing requires linking all member hists in a group to the leader's. Thus hists__output_resort should be called after linking all events in evlist.
Introduce symbol_conf.event_group flag to determine whether the feature is enabled or not.
--- tools/perf/builtin-report.c | 13 ++++++++++++- tools/perf/util/symbol.h | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +12 -1
@@ -416,8 +416,16 @@ static int __cmd_report(struct perf_report *rep) hists->symbol_filter_str = rep->symbol_filter_str;hists__collapse_resort (hists); -hists__output_resort (hists); nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE ]; + +/* Non-group events are considered as leader */ +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) { +struct hists *leader_hists = &pos->leader->hists; + +hists__match (leader_hists, hists); +hists__link (leader_hists, hists); + } }if (nr_samples ==0 ) {
@@ -425,6 +433,9 @@ static int __cmd_report(struct perf_report *rep) goto out_delete; } +list_for_each_entry (pos, &session->evlist->entries, node) +hists__output_resort (&pos->hists); +if (use_browser >0 ) {if (use_browser ==1 ) { perf_evlist__tui_browse_hists(session->evlist, help,
tools/perf/util/symbol.h +2 -1
@@ -96,7 +96,8 @@ struct symbol_conf { initialized, kptr_restrict, annotate_asm_raw, - annotate_src; + annotate_src, + event_group;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Namhyung Kim
maintainerPATCH 5/19 perf hists: Resort hist entries using group members for output
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
When event group is enabled, sorting hist entries on periods for output should consider groups members' period also. To do that, build period table using link/pair information and compare the table.
--- tools/perf/util/evsel.h | 2 ++ tools/perf/util/hist.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-)
tools/perf/util/evsel.h +2 -0
@@ -78,6 +78,8 @@ struct perf_evsel {char *group_name; }; +#define hists_to_evsel (h) container_of(h, struct perf_evsel, hists) +struct cpu_map ;struct thread_map ;struct perf_evlist ;
tools/perf/util/hist.c +58 -1
77 lines not on this page · raw message
Signature · 1 line
1.7.11.7
[tip:perf/core] perf hists: Resort hist entries using group members for output
Commit-ID: 29d720ed5f897d7e26f6b36c12c7704dc200d107 Gitweb: http://git.kernel.org/tip/29d720ed5f897d7e26f6b36c12c7704dc200d107 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:33 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:45 -0300
perf hists: Resort hist entries using group members for output
When event group is enabled, sorting hist entries on periods for output should consider groups members' period also. To do that, build period table using link/pair information and compare the table.
--- tools/perf/util/evsel.h | 2 ++ tools/perf/util/hist.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-)
tools/perf/util/evsel.h +2 -0
@@ -79,6 +79,8 @@ struct perf_evsel {char *group_name; }; +#define hists_to_evsel (h) container_of(h, struct perf_evsel, hists) +struct cpu_map ;struct thread_map ;struct perf_evlist ;
tools/perf/util/hist.c +58 -1
77 lines not on this page · raw message
Namhyung Kim
maintainerPATCH 6/19 perf ui/hist: Consolidate hpp helpers
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Most of hpp helper functions do same jobs for different fields thus consolidate them to appropriate functions/macros.
--- tools/perf/ui/hist.c | 238 ++++++++++++++++++--------------------------------- 1 file changed, 84 insertions(+), 154 deletions(-)
tools/perf/ui/hist.c +84 -154
@@ -3,151 +3,107 @@#include "../util/hist.h" #include "../util/util.h" #include "../util/sort.h" - +#include "../util/evsel.h" /* hist period print (hpp) functions */ -static int hpp__header_overhead (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"Overhead" ); -} - -static int hpp__width_overhead (struct perf_hpp *hpp__maybe_unused ) -{ -return 8 ; -} - -static int hpp__color_overhead (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period / hists->stats.total_period; - -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); -} - -static int hpp__entry_overhead (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); -} - -static int hpp__header_overhead_sys (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"sys" ); -} - -static int hpp__width_overhead_sys (struct perf_hpp *hpp__maybe_unused ) -{ -return 7 ; -} - -static int hpp__color_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_sys / hists->stats.total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); -} +typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); -static int hpp__entry_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__percent_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn) { +int ret; +double percent =0.0 ;struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_sys / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); -} - -static int hpp__header_overhead_us (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ; -return scnprintf (hpp->buf, hpp->size, fmt,"user" ); -} +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; -static int hpp__width_overhead_us (struct perf_hpp *hpp__maybe_unused ) -{ -return 7 ; + ret =print_fn (hpp->buf, hpp->size, fmt, percent); +return ret; } -static int hpp__color_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__raw_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn) { -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_us / hists->stats.total_period; +int ret; -return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); + ret =print_fn (hpp->buf, hpp->size, fmt,get_field (he)); +return ret; } -static int hpp__entry_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_us / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ; -return scnprintf (hpp->buf, hpp->size, fmt, percent); +#define __HPP_HEADER_FN (_type, _str, _min_width, _unit_width) \ +static int hpp__header_##_type(struct perf_hpp *hpp) \ +{ \ + int len = _min_width; \ + \ + return scnprintf(hpp->buf, hpp->size, "%*s", len, _str); \ } -static int hpp__header_overhead_guest_sys (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"guest sys" ); +#define __HPP_WIDTH_FN (_type, _min_width, _unit_width) \ +static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused) \ +{ \ + int len = _min_width; \ + \ + return len; \ } -static int hpp__width_overhead_guest_sys (struct perf_hpp *hpp__maybe_unused ) -{ -return 9 ; +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 he_get_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + return __hpp__percent_fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + (hpp_snprint_fn)percent_color_snprintf); \ } -static int hpp__color_overhead_guest_sys (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_sys / hists->stats.total_period; - -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); +#define __HPP_ENTRY_PERCENT_FN (_type, _field) \ +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%"; \ + return __hpp__percent_fmt(hpp, he, he_get_##_field, fmt, \ + scnprintf); \ } -static int hpp__entry_overhead_guest_sys (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_sys / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); +#define __HPP_ENTRY_RAW_FN (_type, _field) \ +static u64 he_get_raw_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + const char *fmt = symbol_conf.field_sep ? " %"PRIu64 : " %11"PRIu64; \ + return __hpp__raw_fmt(hpp, he, he_get_raw_##_field, fmt, scnprintf); \ } -static int hpp__header_overhead_guest_us (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"guest usr" ); -} +#define HPP_PERCENT_FNS (_type, _str, _field, _min_width, _unit_width) \ +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \ +__HPP_WIDTH_FN(_type, _min_width, _unit_width) \ +__HPP_COLOR_PERCENT_FN(_type, _field) \ +__HPP_ENTRY_PERCENT_FN(_type, _field) -static int hpp__width_overhead_guest_us (struct perf_hpp *hpp__maybe_unused ) -{ -return 9 ; -} +#define HPP_RAW_FNS (_type, _str, _field, _min_width, _unit_width) \ +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \ +__HPP_WIDTH_FN(_type, _min_width, _unit_width) \ +__HPP_ENTRY_RAW_FN(_type, _field) -static int hpp__color_overhead_guest_us (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_us / hists->stats.total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); -} +HPP_PERCENT_FNS(overhead, "Overhead", period, 8, 8) +HPP_PERCENT_FNS(overhead_sys, "sys", period_sys, 8, 8) +HPP_PERCENT_FNS(overhead_us, "usr", period_us, 8, 8) +HPP_PERCENT_FNS(overhead_guest_sys, "guest sys", period_guest_sys, 9, 8) +HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8) -static int hpp__entry_overhead_guest_us (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_us / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ; +HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12) +HPP_RAW_FNS(period, "Period", period, 12, 12) -return scnprintf (hpp->buf, hpp->size, fmt, percent); -}static int hpp__header_baseline (struct perf_hpp *hpp) {
@@ -179,7 +135,7 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) {double percent =baseline_percent (he); -if (hist_entry__has_pairs (he)) +if (hist_entry__has_pairs (he) || symbol_conf.field_sep)return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent);else return scnprintf (hpp->buf, hpp->size," " );
@@ -196,44 +152,6 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size," " ); } -static int hpp__header_samples (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%11s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"Samples" ); -} - -static int hpp__width_samples (struct perf_hpp *hpp__maybe_unused ) -{ -return 11 ; -} - -static int hpp__entry_samples (struct perf_hpp *hpp,struct hist_entry *he) -{ -const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%11" PRIu64; - -return scnprintf (hpp->buf, hpp->size, fmt, he->stat.nr_events); -} - -static int hpp__header_period (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"Period" ); -} - -static int hpp__width_period (struct perf_hpp *hpp__maybe_unused ) -{ -return 12 ; -} - -static int hpp__entry_period (struct perf_hpp *hpp,struct hist_entry *he) -{ -const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%12" PRIu64; - -return scnprintf (hpp->buf, hpp->size, fmt, he->stat.period); -} -static int hpp__header_period_baseline (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ;
@@ -254,6 +172,7 @@ static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *hreturn scnprintf (hpp->buf, hpp->size, fmt, period); } +static int hpp__header_delta (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;
@@ -408,9 +327,20 @@ struct perf_hpp_fmt perf_hpp__format[] = {LIST_HEAD (perf_hpp__list); +#undef HPP__COLOR_PRINT_FNS#undef HPP__PRINT_FNS +#undef HPP_PERCENT_FNS +#undef HPP_RAW_FNS + +#undef __HPP_HEADER_FN +#undef __HPP_WIDTH_FN +#undef __HPP_COLOR_PERCENT_FN +#undef __HPP_ENTRY_PERCENT_FN +#undef __HPP_ENTRY_RAW_FN + +void perf_hpp__init (void ) {if (symbol_conf.show_cpu_utilization) {
Signature · 1 line
1.7.11.7
[tip:perf/core] perf ui/hist: Consolidate hpp helpers
Commit-ID: 4fb71074a570aab9ba8a30b7a756a3c637a14c03 Gitweb: http://git.kernel.org/tip/4fb71074a570aab9ba8a30b7a756a3c637a14c03 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:34 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:45 -0300
perf ui/hist: Consolidate hpp helpers
Most of hpp helper functions do same jobs for different fields thus consolidate them to appropriate functions/macros.
--- tools/perf/ui/hist.c | 238 ++++++++++++++++++--------------------------------- 1 file changed, 84 insertions(+), 154 deletions(-)
tools/perf/ui/hist.c +84 -154
@@ -3,151 +3,107 @@#include "../util/hist.h" #include "../util/util.h" #include "../util/sort.h" - +#include "../util/evsel.h" /* hist period print (hpp) functions */ -static int hpp__header_overhead (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"Overhead" ); -} - -static int hpp__width_overhead (struct perf_hpp *hpp__maybe_unused ) -{ -return 8 ; -} - -static int hpp__color_overhead (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period / hists->stats.total_period; - -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); -} - -static int hpp__entry_overhead (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); -} - -static int hpp__header_overhead_sys (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"sys" ); -} - -static int hpp__width_overhead_sys (struct perf_hpp *hpp__maybe_unused ) -{ -return 7 ; -} - -static int hpp__color_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_sys / hists->stats.total_period; -return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); -} +typedef int (*hpp_snprint_fn )(char *buf,size_t size,const char *fmt, ...); -static int hpp__entry_overhead_sys (struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__percent_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn) { +int ret; +double percent =0.0 ;struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_sys / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); -} - -static int hpp__header_overhead_us (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ; -return scnprintf (hpp->buf, hpp->size, fmt,"user" ); -} +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; -static int hpp__width_overhead_us (struct perf_hpp *hpp__maybe_unused ) -{ -return 7 ; + ret =print_fn (hpp->buf, hpp->size, fmt, percent); +return ret; } -static int hpp__color_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__raw_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *), +const char *fmt,hpp_snprint_fn print_fn) { -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_us / hists->stats.total_period; +int ret; -return percent_color_snprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); + ret =print_fn (hpp->buf, hpp->size, fmt,get_field (he)); +return ret; } -static int hpp__entry_overhead_us (struct perf_hpp *hpp,struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_us / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :"%6.2f%%" ; -return scnprintf (hpp->buf, hpp->size, fmt, percent); +#define __HPP_HEADER_FN (_type, _str, _min_width, _unit_width) \ +static int hpp__header_##_type(struct perf_hpp *hpp) \ +{ \ + int len = _min_width; \ + \ + return scnprintf(hpp->buf, hpp->size, "%*s", len, _str); \ } -static int hpp__header_overhead_guest_sys (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"guest sys" ); +#define __HPP_WIDTH_FN (_type, _min_width, _unit_width) \ +static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused) \ +{ \ + int len = _min_width; \ + \ + return len; \ } -static int hpp__width_overhead_guest_sys (struct perf_hpp *hpp__maybe_unused ) -{ -return 9 ; +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 he_get_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + return __hpp__percent_fmt(hpp, he, he_get_##_field, " %6.2f%%", \ + (hpp_snprint_fn)percent_color_snprintf); \ } -static int hpp__color_overhead_guest_sys (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_sys / hists->stats.total_period; - -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); +#define __HPP_ENTRY_PERCENT_FN (_type, _field) \ +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%"; \ + return __hpp__percent_fmt(hpp, he, he_get_##_field, fmt, \ + scnprintf); \ } -static int hpp__entry_overhead_guest_sys (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_sys / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ; - -return scnprintf (hpp->buf, hpp->size, fmt, percent); +#define __HPP_ENTRY_RAW_FN (_type, _field) \ +static u64 he_get_raw_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ +{ \ + const char *fmt = symbol_conf.field_sep ? " %"PRIu64 : " %11"PRIu64; \ + return __hpp__raw_fmt(hpp, he, he_get_raw_##_field, fmt, scnprintf); \ } -static int hpp__header_overhead_guest_us (struct perf_hpp *hpp) -{ -return scnprintf (hpp->buf, hpp->size,"guest usr" ); -} +#define HPP_PERCENT_FNS (_type, _str, _field, _min_width, _unit_width) \ +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \ +__HPP_WIDTH_FN(_type, _min_width, _unit_width) \ +__HPP_COLOR_PERCENT_FN(_type, _field) \ +__HPP_ENTRY_PERCENT_FN(_type, _field) -static int hpp__width_overhead_guest_us (struct perf_hpp *hpp__maybe_unused ) -{ -return 9 ; -} +#define HPP_RAW_FNS (_type, _str, _field, _min_width, _unit_width) \ +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \ +__HPP_WIDTH_FN(_type, _min_width, _unit_width) \ +__HPP_ENTRY_RAW_FN(_type, _field) -static int hpp__color_overhead_guest_us (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_us / hists->stats.total_period; -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%% " , percent); -} +HPP_PERCENT_FNS(overhead, "Overhead", period, 8, 8) +HPP_PERCENT_FNS(overhead_sys, "sys", period_sys, 8, 8) +HPP_PERCENT_FNS(overhead_us, "usr", period_us, 8, 8) +HPP_PERCENT_FNS(overhead_guest_sys, "guest sys", period_guest_sys, 9, 8) +HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8) -static int hpp__entry_overhead_guest_us (struct perf_hpp *hpp, -struct hist_entry *he) -{ -struct hists *hists = he->hists; -double percent =100.0 * he->stat.period_guest_us / hists->stats.total_period; -const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%% " ; +HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12) +HPP_RAW_FNS(period, "Period", period, 12, 12) -return scnprintf (hpp->buf, hpp->size, fmt, percent); -}static int hpp__header_baseline (struct perf_hpp *hpp) {
@@ -179,7 +135,7 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) {double percent =baseline_percent (he); -if (hist_entry__has_pairs (he)) +if (hist_entry__has_pairs (he) || symbol_conf.field_sep)return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent);else return scnprintf (hpp->buf, hpp->size," " );
@@ -196,44 +152,6 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size," " ); } -static int hpp__header_samples (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%11s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"Samples" ); -} - -static int hpp__width_samples (struct perf_hpp *hpp__maybe_unused ) -{ -return 11 ; -} - -static int hpp__entry_samples (struct perf_hpp *hpp,struct hist_entry *he) -{ -const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%11" PRIu64; - -return scnprintf (hpp->buf, hpp->size, fmt, he->stat.nr_events); -} - -static int hpp__header_period (struct perf_hpp *hpp) -{ -const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ; - -return scnprintf (hpp->buf, hpp->size, fmt,"Period" ); -} - -static int hpp__width_period (struct perf_hpp *hpp__maybe_unused ) -{ -return 12 ; -} - -static int hpp__entry_period (struct perf_hpp *hpp,struct hist_entry *he) -{ -const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%12" PRIu64; - -return scnprintf (hpp->buf, hpp->size, fmt, he->stat.period); -} -static int hpp__header_period_baseline (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ;
@@ -254,6 +172,7 @@ static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *hreturn scnprintf (hpp->buf, hpp->size, fmt, period); } +static int hpp__header_delta (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;
@@ -408,9 +327,20 @@ struct perf_hpp_fmt perf_hpp__format[] = {LIST_HEAD (perf_hpp__list); +#undef HPP__COLOR_PRINT_FNS#undef HPP__PRINT_FNS +#undef HPP_PERCENT_FNS +#undef HPP_RAW_FNS + +#undef __HPP_HEADER_FN +#undef __HPP_WIDTH_FN +#undef __HPP_COLOR_PERCENT_FN +#undef __HPP_ENTRY_PERCENT_FN +#undef __HPP_ENTRY_RAW_FN + +void perf_hpp__init (void ) {if (symbol_conf.show_cpu_utilization) {
Namhyung Kim
maintainerPATCH 7/19 perf hist browser: Convert hpp helpers to a function
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The hpp helpers do same job for each field so it was implemented as macro in order to access those fields easily. But it gets cumbersome to maintain a large function in a macro as the function grows. Factor it out to a function with a little helper macro to access field.
--- tools/perf/ui/browsers/hists.c | 46 +++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-)
tools/perf/ui/browsers/hists.c +32 -14
@@ -567,23 +567,41 @@ static int hist_browser__show_callchain(struct hist_browser *browser,return row - first_row; } -#define HPP__COLOR_FN (_name, _field) \ -static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp, \ - struct hist_entry *he) \ +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *)) +{ +int ret; +double percent =0.0 ; +struct hists *hists = he->hists; + +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; + + *(double *)hpp->ptr = percent; + + ret =scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); +return ret; +} + +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 __hpp_get_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp, \ + struct hist_entry *he) \ { \ - struct hists *hists = he->hists; \ - double percent = 100.0 * he->stat._field / hists->stats.total_period; \ - *(double *)hpp->ptr = percent; \ - return scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent); \ + return __hpp__color_fmt(hpp, he, __hpp_get_##_field); \ } -HPP__COLOR_FN(overhead, period) -HPP__COLOR_FN(overhead_sys, period_sys) -HPP__COLOR_FN(overhead_us, period_us) -HPP__COLOR_FN(overhead_guest_sys, period_guest_sys) -HPP__COLOR_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) -#undef HPP__COLOR_FN +#undef __HPP_COLOR_PERCENT_FNvoid hist_browser__init_hpp (void ) {
@@ -646,7 +664,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,if (fmt->color) { hpp.ptr = &percent; -/* It will set percent for us. See HPP__COLOR_FN above. */ +/* It will set percent for us. See __hpp__color_fmt above. */ width -= fmt->color (&hpp, entry);ui_browser__set_percent_color (&browser->b, percent, current_entry);
Signature · 1 line
1.7.11.7
[tip:perf/core] perf hists browser: Convert hpp helpers to a function
Commit-ID: 5aed9d24934be5b7fec1b66cc2a5f29fab4ec11e Gitweb: http://git.kernel.org/tip/5aed9d24934be5b7fec1b66cc2a5f29fab4ec11e Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:35 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:46 -0300
perf hists browser: Convert hpp helpers to a function
The hpp helpers do same job for each field so it was implemented as macro in order to access those fields easily. But it gets cumbersome to maintain a large function in a macro as the function grows. Factor it out to a function with a little helper macro to access field.
--- tools/perf/ui/browsers/hists.c | 46 +++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-)
tools/perf/ui/browsers/hists.c +32 -14
@@ -567,23 +567,41 @@ static int hist_browser__show_callchain(struct hist_browser *browser,return row - first_row; } -#define HPP__COLOR_FN (_name, _field) \ -static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp, \ - struct hist_entry *he) \ +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *)) +{ +int ret; +double percent =0.0 ; +struct hists *hists = he->hists; + +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; + + *(double *)hpp->ptr = percent; + + ret =scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); +return ret; +} + +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 __hpp_get_##_field(struct hist_entry *he) \ +{ \ + return he->stat._field; \ +} \ + \ +static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp, \ + struct hist_entry *he) \ { \ - struct hists *hists = he->hists; \ - double percent = 100.0 * he->stat._field / hists->stats.total_period; \ - *(double *)hpp->ptr = percent; \ - return scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent); \ + return __hpp__color_fmt(hpp, he, __hpp_get_##_field); \ } -HPP__COLOR_FN(overhead, period) -HPP__COLOR_FN(overhead_sys, period_sys) -HPP__COLOR_FN(overhead_us, period_us) -HPP__COLOR_FN(overhead_guest_sys, period_guest_sys) -HPP__COLOR_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) -#undef HPP__COLOR_FN +#undef __HPP_COLOR_PERCENT_FNvoid hist_browser__init_hpp (void ) {
@@ -646,7 +664,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,if (fmt->color) { hpp.ptr = &percent; -/* It will set percent for us. See HPP__COLOR_FN above. */ +/* It will set percent for us. See __hpp__color_fmt above. */ width -= fmt->color (&hpp, entry);ui_browser__set_percent_color (&browser->b, percent, current_entry);
Namhyung Kim
maintainerPATCH 8/19 perf gtk/browser: Convert hpp helpers to a function
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The hpp helpers do same job for each field so it was implemented as macro in order to access those fields easily. But it gets cumbersome to maintain a large function in a macro as the function grows. Factor it out to a function with a little helper macro to access field.
--- tools/perf/ui/gtk/hists.c | 68 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-)
tools/perf/ui/gtk/hists.c +47 -21
@@ -8,32 +8,58 @@#define MAX_COLUMNS 32 -#define HPP__COLOR_FN (_name, _field) \ -static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ - struct hist_entry *he) \ +static int perf_gtk__percent_color_snprintf (char *buf,size_t size, +double percent) +{ +int ret =0 ; +const char *markup; + + markup =perf_gtk__get_percent_color (percent); +if (markup) + ret +=scnprintf (buf, size, markup); + + ret +=scnprintf (buf + ret, size - ret,"%6.2f%%" , percent); + +if (markup) + ret +=scnprintf (buf + ret, size - ret,"</span>" ); + +return ret; +} + + +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *)) +{ +int ret; +double percent =0.0 ; +struct hists *hists = he->hists; + +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; + + ret =perf_gtk__percent_color_snprintf (hpp->buf, hpp->size, percent); +return ret; +} + +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 he_get_##_field(struct hist_entry *he) \ { \ - struct hists *hists = he->hists; \ - double percent = 100.0 * he->stat._field / hists->stats.total_period; \ - const char *markup; \ - int ret = 0; \ - \ - markup = perf_gtk__get_percent_color(percent); \ - if (markup) \ - ret += scnprintf(hpp->buf, hpp->size, "%s", markup); \ - ret += scnprintf(hpp->buf + ret, hpp->size - ret, "%6.2f%%", percent); \ - if (markup) \ - ret += scnprintf(hpp->buf + ret, hpp->size - ret, "</span>"); \ + return he->stat._field; \ +} \ \ - return ret; \ +static int perf_gtk__hpp_color_##_type(struct perf_hpp *hpp, \ + struct hist_entry *he) \ +{ \ + return __hpp__color_fmt(hpp, he, he_get_##_field); \ } -HPP__COLOR_FN(overhead, period) -HPP__COLOR_FN(overhead_sys, period_sys) -HPP__COLOR_FN(overhead_us, period_us) -HPP__COLOR_FN(overhead_guest_sys, period_guest_sys) -HPP__COLOR_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) -#undef HPP__COLOR_FN +#undef __HPP_COLOR_PERCENT_FNvoid perf_gtk__init_hpp (void )
Signature · 1 line
1.7.11.7
[tip:perf/core] perf gtk/browser: Convert hpp helpers to a function
Commit-ID: 843985e953ddcc3d57a62641b377c8d3222859e2 Gitweb: http://git.kernel.org/tip/843985e953ddcc3d57a62641b377c8d3222859e2 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:36 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:46 -0300
perf gtk/browser: Convert hpp helpers to a function
The hpp helpers do same job for each field so it was implemented as macro in order to access those fields easily. But it gets cumbersome to maintain a large function in a macro as the function grows. Factor it out to a function with a little helper macro to access field.
--- tools/perf/ui/gtk/hists.c | 68 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-)
tools/perf/ui/gtk/hists.c +47 -21
@@ -8,32 +8,58 @@#define MAX_COLUMNS 32 -#define HPP__COLOR_FN (_name, _field) \ -static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ - struct hist_entry *he) \ +static int perf_gtk__percent_color_snprintf (char *buf,size_t size, +double percent) +{ +int ret =0 ; +const char *markup; + + markup =perf_gtk__get_percent_color (percent); +if (markup) + ret +=scnprintf (buf, size, markup); + + ret +=scnprintf (buf + ret, size - ret,"%6.2f%%" , percent); + +if (markup) + ret +=scnprintf (buf + ret, size - ret,"</span>" ); + +return ret; +} + + +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, +u64 (*get_field)(struct hist_entry *)) +{ +int ret; +double percent =0.0 ; +struct hists *hists = he->hists; + +if (hists->stats.total_period) + percent =100.0 *get_field (he) / hists->stats.total_period; + + ret =perf_gtk__percent_color_snprintf (hpp->buf, hpp->size, percent); +return ret; +} + +#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +static u64 he_get_##_field(struct hist_entry *he) \ { \ - struct hists *hists = he->hists; \ - double percent = 100.0 * he->stat._field / hists->stats.total_period; \ - const char *markup; \ - int ret = 0; \ - \ - markup = perf_gtk__get_percent_color(percent); \ - if (markup) \ - ret += scnprintf(hpp->buf, hpp->size, "%s", markup); \ - ret += scnprintf(hpp->buf + ret, hpp->size - ret, "%6.2f%%", percent); \ - if (markup) \ - ret += scnprintf(hpp->buf + ret, hpp->size - ret, "</span>"); \ + return he->stat._field; \ +} \ \ - return ret; \ +static int perf_gtk__hpp_color_##_type(struct perf_hpp *hpp, \ + struct hist_entry *he) \ +{ \ + return __hpp__color_fmt(hpp, he, he_get_##_field); \ } -HPP__COLOR_FN(overhead, period) -HPP__COLOR_FN(overhead_sys, period_sys) -HPP__COLOR_FN(overhead_us, period_us) -HPP__COLOR_FN(overhead_guest_sys, period_guest_sys) -HPP__COLOR_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) -#undef HPP__COLOR_FN +#undef __HPP_COLOR_PERCENT_FNvoid perf_gtk__init_hpp (void )
Namhyung Kim
maintainerPATCH 9/19 perf ui/hist: Add support for event group view
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Show group member's overhead also when showing the leader's if event group is enabled.
--- tools/perf/ui/hist.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- tools/perf/ui/stdio/hist.c | 2 ++ 2 files changed, 63 insertions(+), 1 deletion(-)
tools/perf/ui/hist.c +61 -1
@@ -21,6 +21,53 @@ static int __hpp__percent_fmt(struct perf_hpp *hpp, struct hist_entry *he, percent =100.0 *get_field (he) / hists->stats.total_period; ret =print_fn (hpp->buf, hpp->size, fmt, percent); + +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) +return ret; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + +if (!total) +continue ; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + } + + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,100.0 * period / total); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + } + }return ret; }
@@ -40,6 +87,11 @@ static int hpp__header_##_type(struct perf_hpp *hpp) \ { \int len = _min_width; \ \ +if (symbol_conf.event_group) { \ +struct perf_evsel *evsel = hpp->ptr; \ + \ + len =max (len, evsel->nr_members * _unit_width); \ + } \return scnprintf (hpp->buf, hpp->size,"%*s" , len, _str); \ }
@@ -48,6 +100,11 @@ static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused) \ { \int len = _min_width; \ \ +if (symbol_conf.event_group) { \ +struct perf_evsel *evsel = hpp->ptr; \ + \ + len =max (len, evsel->nr_members * _unit_width); \ + } \return len; \ }
@@ -438,12 +495,15 @@ unsigned int hists__sort_list_width(struct hists *hists)struct perf_hpp_fmt *fmt;struct sort_entry *se;int i =0 , ret =0 ; +struct perf_hpp dummy_hpp = { + .ptr =hists_to_evsel (hists), + };perf_hpp__for_each_format (fmt) {if (i) ret +=2 ; - ret += fmt->width (NULL ); + ret += fmt->width (&dummy_hpp); }list_for_each_entry (se, &hist_entry__sort_list, list)
tools/perf/ui/stdio/hist.c +2 -0
@@ -3,6 +3,7 @@#include "../../util/util.h" #include "../../util/hist.h" #include "../../util/sort.h" +#include "../../util/evsel.h" static size_t callchain__fprintf_left_margin (FILE *fp,int left_margin)
@@ -347,6 +348,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,struct perf_hpp dummy_hpp = { .buf = bf, .size =sizeof (bf), + .ptr =hists_to_evsel (hists), };bool first = true;
Signature · 1 line
1.7.11.7
[tip:perf/core] perf ui/hist: Add support for event group view
Commit-ID: 5b9e2146ec4f8c6d436f9f7043a0409a4296a705 Gitweb: http://git.kernel.org/tip/5b9e2146ec4f8c6d436f9f7043a0409a4296a705 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:37 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:46 -0300
perf ui/hist: Add support for event group view
Show group member's overhead also when showing the leader's if event group is enabled.
--- tools/perf/ui/hist.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- tools/perf/ui/stdio/hist.c | 2 ++ 2 files changed, 63 insertions(+), 1 deletion(-)
tools/perf/ui/hist.c +61 -1
@@ -21,6 +21,53 @@ static int __hpp__percent_fmt(struct perf_hpp *hpp, struct hist_entry *he, percent =100.0 *get_field (he) / hists->stats.total_period; ret =print_fn (hpp->buf, hpp->size, fmt, percent); + +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) +return ret; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + +if (!total) +continue ; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + } + + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,100.0 * period / total); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ + ret +=print_fn (hpp->buf + ret, hpp->size - ret, + fmt,0.0 ); + } + }return ret; }
@@ -40,6 +87,11 @@ static int hpp__header_##_type(struct perf_hpp *hpp) \ { \int len = _min_width; \ \ +if (symbol_conf.event_group) { \ +struct perf_evsel *evsel = hpp->ptr; \ + \ + len =max (len, evsel->nr_members * _unit_width); \ + } \return scnprintf (hpp->buf, hpp->size,"%*s" , len, _str); \ }
@@ -48,6 +100,11 @@ static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused) \ { \int len = _min_width; \ \ +if (symbol_conf.event_group) { \ +struct perf_evsel *evsel = hpp->ptr; \ + \ + len =max (len, evsel->nr_members * _unit_width); \ + } \return len; \ }
@@ -438,12 +495,15 @@ unsigned int hists__sort_list_width(struct hists *hists)struct perf_hpp_fmt *fmt;struct sort_entry *se;int i =0 , ret =0 ; +struct perf_hpp dummy_hpp = { + .ptr =hists_to_evsel (hists), + };perf_hpp__for_each_format (fmt) {if (i) ret +=2 ; - ret += fmt->width (NULL ); + ret += fmt->width (&dummy_hpp); }list_for_each_entry (se, &hist_entry__sort_list, list)
tools/perf/ui/stdio/hist.c +2 -0
@@ -3,6 +3,7 @@#include "../../util/util.h" #include "../../util/hist.h" #include "../../util/sort.h" +#include "../../util/evsel.h" static size_t callchain__fprintf_left_margin (FILE *fp,int left_margin)
@@ -347,6 +348,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,struct perf_hpp dummy_hpp = { .buf = bf, .size =sizeof (bf), + .ptr =hists_to_evsel (hists), };bool first = true;
Namhyung Kim
maintainerPATCH 10/19 perf hist browser: Move coloring logic to hpp functions
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Move coloring logic into the hpp functions so that each value can be colored independently. It'd required for event group view.
For overhead column, add a callback for printing 'folded_sign' of callchains of a hist entry.
--- tools/perf/ui/browsers/hists.c | 72 ++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 30 deletions(-)
tools/perf/ui/browsers/hists.c +42 -30
@@ -567,23 +567,48 @@ static int hist_browser__show_callchain(struct hist_browser *browser,return row - first_row; } +struct hpp_arg { +struct ui_browser *b; +char folded_sign; +bool current_entry; +}; + +static int __hpp__color_callchain (struct hpp_arg *arg) +{ +if (!symbol_conf.use_callchain) +return 0 ; + +slsmg_printf ("%c " , arg->folded_sign); +return 2 ; +} +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *)) +u64 (*get_field)(struct hist_entry *), +int (*callchain_cb)(struct hpp_arg *)) { -int ret; +int ret =0 ;double percent =0.0 ;struct hists *hists = he->hists; +struct hpp_arg *arg = hpp->ptr;if (hists->stats.total_period) percent =100.0 *get_field (he) / hists->stats.total_period; - *(double *)hpp->ptr = percent; +ui_browser__set_percent_color (arg->b, percent, arg->current_entry); + +if (callchain_cb) + ret +=callchain_cb (arg); + + ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); +slsmg_printf ("%s" , hpp->buf); + +if (!arg->current_entry || !arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); - ret =scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent);return ret; } -#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +#define __HPP_COLOR_PERCENT_FN (_type, _field, _cb) \ static u64 __hpp_get_##_field(struct hist_entry *he) \ { \ return he->stat._field; \
@@ -592,14 +617,14 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \ static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__color_fmt(hpp, he, __hpp_get_##_field); \ + return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \ } -__HPP_COLOR_PERCENT_FN(overhead, period) -__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) -__HPP_COLOR_PERCENT_FN(overhead_us, period_us) -__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) -__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__color_callchain) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, NULL) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us, NULL) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, NULL) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, NULL)#undef __HPP_COLOR_PERCENT_FN
@@ -626,7 +651,6 @@ static int hist_browser__show_entry(struct hist_browser *browser, unsigned short row) {char s[256 ]; -double percent;int printed =0 ;int width = browser->b.width;char folded_sign =' ' ;
@@ -646,16 +670,20 @@ static int hist_browser__show_entry(struct hist_browser *browser, }if (row_offset ==0 ) { +struct hpp_arg arg = { + .b = &browser->b, + .folded_sign = folded_sign, + .current_entry = current_entry, + };struct perf_hpp hpp = { .buf = s, .size =sizeof (s), + .ptr = &arg, }; -int i =0 ;ui_browser__gotorc (&browser->b, row,0 );perf_hpp__for_each_format (fmt) { -if (!first) {slsmg_printf (" " ); width -=2 ;
@@ -663,27 +691,11 @@ static int hist_browser__show_entry(struct hist_browser *browser, first = false;if (fmt->color) { - hpp.ptr = &percent; -/* It will set percent for us. See __hpp__color_fmt above. */ width -= fmt->color (&hpp, entry); - -ui_browser__set_percent_color (&browser->b, percent, current_entry); - -if (!i && symbol_conf.use_callchain) { -slsmg_printf ("%c " , folded_sign); - width -=2 ; - } - -slsmg_printf ("%s" , s); - -if (!current_entry || !browser->b.navkeypressed) -ui_browser__set_color (&browser->b,HE_COLORSET_NORMAL ); }else { width -= fmt->entry (&hpp, entry);slsmg_printf ("%s" , s); } - - i++; }/* The scroll bar isn't being used */
Signature · 1 line
1.7.11.7
[tip:perf/core] perf hists browser: Move coloring logic to hpp functions
Commit-ID: 897014603c4786ef33450e675e02a5e74dc63785 Gitweb: http://git.kernel.org/tip/897014603c4786ef33450e675e02a5e74dc63785 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:38 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:47 -0300
perf hists browser: Move coloring logic to hpp functions
Move coloring logic into the hpp functions so that each value can be colored independently. It'd required for event group view.
For overhead column, add a callback for printing 'folded_sign' of callchains of a hist entry.
--- tools/perf/ui/browsers/hists.c | 72 ++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 30 deletions(-)
tools/perf/ui/browsers/hists.c +42 -30
@@ -567,23 +567,48 @@ static int hist_browser__show_callchain(struct hist_browser *browser,return row - first_row; } +struct hpp_arg { +struct ui_browser *b; +char folded_sign; +bool current_entry; +}; + +static int __hpp__color_callchain (struct hpp_arg *arg) +{ +if (!symbol_conf.use_callchain) +return 0 ; + +slsmg_printf ("%c " , arg->folded_sign); +return 2 ; +} +static int __hpp__color_fmt (struct perf_hpp *hpp,struct hist_entry *he, -u64 (*get_field)(struct hist_entry *)) +u64 (*get_field)(struct hist_entry *), +int (*callchain_cb)(struct hpp_arg *)) { -int ret; +int ret =0 ;double percent =0.0 ;struct hists *hists = he->hists; +struct hpp_arg *arg = hpp->ptr;if (hists->stats.total_period) percent =100.0 *get_field (he) / hists->stats.total_period; - *(double *)hpp->ptr = percent; +ui_browser__set_percent_color (arg->b, percent, arg->current_entry); + +if (callchain_cb) + ret +=callchain_cb (arg); + + ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent); +slsmg_printf ("%s" , hpp->buf); + +if (!arg->current_entry || !arg->b->navkeypressed) +ui_browser__set_color (arg->b,HE_COLORSET_NORMAL ); - ret =scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent);return ret; } -#define __HPP_COLOR_PERCENT_FN (_type, _field) \ +#define __HPP_COLOR_PERCENT_FN (_type, _field, _cb) \ static u64 __hpp_get_##_field(struct hist_entry *he) \ { \ return he->stat._field; \
@@ -592,14 +617,14 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \ static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp, \struct hist_entry *he) \ { \ - return __hpp__color_fmt(hpp, he, __hpp_get_##_field); \ + return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \ } -__HPP_COLOR_PERCENT_FN(overhead, period) -__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys) -__HPP_COLOR_PERCENT_FN(overhead_us, period_us) -__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys) -__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) +__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__color_callchain) +__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, NULL) +__HPP_COLOR_PERCENT_FN(overhead_us, period_us, NULL) +__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, NULL) +__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, NULL)#undef __HPP_COLOR_PERCENT_FN
@@ -626,7 +651,6 @@ static int hist_browser__show_entry(struct hist_browser *browser, unsigned short row) {char s[256 ]; -double percent;int printed =0 ;int width = browser->b.width;char folded_sign =' ' ;
@@ -646,16 +670,20 @@ static int hist_browser__show_entry(struct hist_browser *browser, }if (row_offset ==0 ) { +struct hpp_arg arg = { + .b = &browser->b, + .folded_sign = folded_sign, + .current_entry = current_entry, + };struct perf_hpp hpp = { .buf = s, .size =sizeof (s), + .ptr = &arg, }; -int i =0 ;ui_browser__gotorc (&browser->b, row,0 );perf_hpp__for_each_format (fmt) { -if (!first) {slsmg_printf (" " ); width -=2 ;
@@ -663,27 +691,11 @@ static int hist_browser__show_entry(struct hist_browser *browser, first = false;if (fmt->color) { - hpp.ptr = &percent; -/* It will set percent for us. See __hpp__color_fmt above. */ width -= fmt->color (&hpp, entry); - -ui_browser__set_percent_color (&browser->b, percent, current_entry); - -if (!i && symbol_conf.use_callchain) { -slsmg_printf ("%c " , folded_sign); - width -=2 ; - } - -slsmg_printf ("%s" , s); - -if (!current_entry || !browser->b.navkeypressed) -ui_browser__set_color (&browser->b,HE_COLORSET_NORMAL ); }else { width -= fmt->entry (&hpp, entry);slsmg_printf ("%s" , s); } - - i++; }/* The scroll bar isn't being used */
Namhyung Kim
maintainerPATCH 11/19 perf hist browser: Add suppport for event group view
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Show group members' overhead also when showing the leader's if event group is enabled.
--- tools/perf/ui/browsers/hists.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
tools/perf/ui/browsers/hists.c +57 -0
@@ -602,6 +602,63 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he, ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent);slsmg_printf ("%s" , hpp->buf); +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) + goto out; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + +if (!total) +continue ; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ +ui_browser__set_percent_color (arg->b,0.0 , + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" ,0.0 ); +slsmg_printf ("%s" , hpp->buf); + } + + percent =100.0 * period / total; +ui_browser__set_percent_color (arg->b, percent, + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" , percent); +slsmg_printf ("%s" , hpp->buf); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ +ui_browser__set_percent_color (arg->b,0.0 , + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" ,0.0 ); +slsmg_printf ("%s" , hpp->buf); + } + } +out:if (!arg->current_entry || !arg->b->navkeypressed)ui_browser__set_color (arg->b,HE_COLORSET_NORMAL );
Signature · 1 line
1.7.11.7
[tip:perf/core] perf hists browser: Add suppport for event group view
Commit-ID: 371d8c402e8c3562e913c7fda95094f42fbcf0ef Gitweb: http://git.kernel.org/tip/371d8c402e8c3562e913c7fda95094f42fbcf0ef Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:39 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:47 -0300
perf hists browser: Add suppport for event group view
Show group members' overhead also when showing the leader's if event group is enabled.
--- tools/perf/ui/browsers/hists.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
tools/perf/ui/browsers/hists.c +57 -0
@@ -602,6 +602,63 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he, ret +=scnprintf (hpp->buf, hpp->size,"%6.2f%%" , percent);slsmg_printf ("%s" , hpp->buf); +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) + goto out; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + +if (!total) +continue ; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ +ui_browser__set_percent_color (arg->b,0.0 , + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" ,0.0 ); +slsmg_printf ("%s" , hpp->buf); + } + + percent =100.0 * period / total; +ui_browser__set_percent_color (arg->b, percent, + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" , percent); +slsmg_printf ("%s" , hpp->buf); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ +ui_browser__set_percent_color (arg->b,0.0 , + arg->current_entry); + ret +=scnprintf (hpp->buf, hpp->size, +" %6.2f%%" ,0.0 ); +slsmg_printf ("%s" , hpp->buf); + } + } +out:if (!arg->current_entry || !arg->b->navkeypressed)ui_browser__set_color (arg->b,HE_COLORSET_NORMAL );
Namhyung Kim
maintainerPATCH 12/19 perf gtk/browser: Add support for event group view
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Show group members's overhead also when showing leader's if event group is enabled.
--- tools/perf/ui/gtk/hists.c | 56 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-)
tools/perf/ui/gtk/hists.c +52 -4
@@ -8,8 +8,7 @@#define MAX_COLUMNS 32 -static int perf_gtk__percent_color_snprintf (char *buf,size_t size, -double percent) +static int __percent_color_snprintf (char *buf,size_t size,double percent) {int ret =0 ;const char *markup;
@@ -18,7 +17,7 @@ static int perf_gtk__percent_color_snprintf(char *buf, size_t size,if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret,"%6.2f%%" , percent); + ret +=scnprintf (buf + ret, size - ret," %6.2f%%" , percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -37,7 +36,55 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,if (hists->stats.total_period) percent =100.0 *get_field (he) / hists->stats.total_period; - ret =perf_gtk__percent_color_snprintf (hpp->buf, hpp->size, percent); + ret =__percent_color_snprintf (hpp->buf, hpp->size, percent); + +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) +return ret; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, +0.0 ); + } + + percent =100.0 * period / total; + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, + percent); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, +0.0 ); + } + }return ret; }
@@ -96,6 +143,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists)struct perf_hpp hpp = { .buf = s, .size =sizeof (s), + .ptr =hists_to_evsel (hists), }; nr_cols =0 ;
Signature · 1 line
1.7.11.7
[tip:perf/core] perf gtk/browser: Add support for event group view
Commit-ID: cb16008bcc6ea53617ca06c9eb4ab0ecafe04585 Gitweb: http://git.kernel.org/tip/cb16008bcc6ea53617ca06c9eb4ab0ecafe04585 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:40 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:47 -0300
perf gtk/browser: Add support for event group view
Show group members's overhead also when showing leader's if event group is enabled.
--- tools/perf/ui/gtk/hists.c | 56 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-)
tools/perf/ui/gtk/hists.c +52 -4
@@ -8,8 +8,7 @@#define MAX_COLUMNS 32 -static int perf_gtk__percent_color_snprintf (char *buf,size_t size, -double percent) +static int __percent_color_snprintf (char *buf,size_t size,double percent) {int ret =0 ;const char *markup;
@@ -18,7 +17,7 @@ static int perf_gtk__percent_color_snprintf(char *buf, size_t size,if (markup) ret +=scnprintf (buf, size, markup); - ret +=scnprintf (buf + ret, size - ret,"%6.2f%%" , percent); + ret +=scnprintf (buf + ret, size - ret," %6.2f%%" , percent);if (markup) ret +=scnprintf (buf + ret, size - ret,"</span>" );
@@ -37,7 +36,55 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,if (hists->stats.total_period) percent =100.0 *get_field (he) / hists->stats.total_period; - ret =perf_gtk__percent_color_snprintf (hpp->buf, hpp->size, percent); + ret =__percent_color_snprintf (hpp->buf, hpp->size, percent); + +if (symbol_conf.event_group) { +int prev_idx, idx_delta; +struct perf_evsel *evsel =hists_to_evsel (hists); +struct hist_entry *pair; +int nr_members = evsel->nr_members; + +if (nr_members <=1 ) +return ret; + + prev_idx =perf_evsel__group_idx (evsel); + +list_for_each_entry (pair, &he->pairs.head, pairs.node) { +u64 period =get_field (pair); +u64 total = pair->hists->stats.total_period; + + evsel =hists_to_evsel (pair->hists); + idx_delta =perf_evsel__group_idx (evsel) - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members in the middle which +* have no sample +*/ + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, +0.0 ); + } + + percent =100.0 * period / total; + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, + percent); + + prev_idx =perf_evsel__group_idx (evsel); + } + + idx_delta = nr_members - prev_idx -1 ; + +while (idx_delta--) { +/* +* zero-fill group members at last which have no sample +*/ + ret +=__percent_color_snprintf (hpp->buf + ret, + hpp->size - ret, +0.0 ); + } + }return ret; }
@@ -96,6 +143,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists)struct perf_hpp hpp = { .buf = s, .size =sizeof (s), + .ptr =hists_to_evsel (hists), }; nr_cols =0 ;
Namhyung Kim
maintainerPATCH 13/19 perf tools: Move ltrim() to util/string.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
As we have ltrim() implementation in builtin-script.c move it to the more generic location of util/string.c so that it can be used from other places.
--- tools/perf/builtin-script.c | 12 ------------ tools/perf/util/string.c | 18 ++++++++++++++++++ tools/perf/util/util.h | 1 + 3 files changed, 19 insertions(+), 12 deletions(-)
tools/perf/builtin-script.c +0 -12
@@ -909,18 +909,6 @@ static const char *ends_with(const char *str, const char *suffix)return NULL ; } -static char *ltrim (char *str) -{ -int len =strlen (str); - -while (len &&isspace (*str)) { - len--; - str++; - } - -return str; -} -static int read_script_info (struct script_desc *desc,const char *filename) {char line[BUFSIZ ], *p;
tools/perf/util/string.c +18 -0
@@ -332,6 +332,24 @@ char *strxfrchar(char *s, char from, char to) }/** +* ltrim - Removes leading whitespace from @s. +* @s: The string to be stripped. +* +* Return pointer to the first non-whitespace character in @s. +*/ +char *ltrim (char *s) +{ +int len =strlen (s); + +while (len &&isspace (*s)) { + len--; + s++; + } + +return s; +} + +/** * rtrim - Removes trailing whitespace from @s. * @s: The string to be stripped. *
tools/perf/util/util.h +1 -0
@@ -265,6 +265,7 @@ bool is_power_of_2(unsigned long n)size_t hex_width (u64 v);int hex2u64 (const char *ptr,u64 *val); +char *ltrim (char *s);char *rtrim (char *s);void dump_stack (void );
Signature · 1 line
1.7.11.7
[tip:perf/core] perf tools: Move ltrim() to util/string.c
Commit-ID: 08aa9cce6bf3ecdfa386cf0a0be842855eac3e7d Gitweb: http://git.kernel.org/tip/08aa9cce6bf3ecdfa386cf0a0be842855eac3e7d Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:41 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 24 Jan 2013 16:40:49 -0300
perf tools: Move ltrim() to util/string.c
As we have ltrim() implementation in builtin-script.c move it to the more generic location of util/string.c so that it can be used from other places.
--- tools/perf/builtin-script.c | 12 ------------ tools/perf/util/string.c | 18 ++++++++++++++++++ tools/perf/util/util.h | 1 + 3 files changed, 19 insertions(+), 12 deletions(-)
tools/perf/builtin-script.c +0 -12
@@ -909,18 +909,6 @@ static const char *ends_with(const char *str, const char *suffix)return NULL ; } -static char *ltrim (char *str) -{ -int len =strlen (str); - -while (len &&isspace (*str)) { - len--; - str++; - } - -return str; -} -static int read_script_info (struct script_desc *desc,const char *filename) {char line[BUFSIZ ], *p;
tools/perf/util/string.c +18 -0
@@ -332,6 +332,24 @@ char *strxfrchar(char *s, char from, char to) }/** +* ltrim - Removes leading whitespace from @s. +* @s: The string to be stripped. +* +* Return pointer to the first non-whitespace character in @s. +*/ +char *ltrim (char *s) +{ +int len =strlen (s); + +while (len &&isspace (*s)) { + len--; + s++; + } + +return s; +} + +/** * rtrim - Removes trailing whitespace from @s. * @s: The string to be stripped. *
tools/perf/util/util.h +1 -0
@@ -265,6 +265,7 @@ bool is_power_of_2(unsigned long n)size_t hex_width (u64 v);int hex2u64 (const char *ptr,u64 *val); +char *ltrim (char *s);char *rtrim (char *s);void dump_stack (void );
Namhyung Kim
maintainerPATCH 14/19 perf gtk/browser: Trim column header string when event group enabled
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
When event group feature is enabled, each column header is expanded to match with the whole group column width. But this is not needed for GTK+ browser since ti usually use variable-width fonts. So trim it.
--- tools/perf/ui/gtk/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/gtk/hists.c +1 -1
@@ -170,7 +170,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists) fmt->header (&hpp);gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), --1 , s, +-1 ,ltrim (s), renderer,"markup" , col_idx++,NULL ); }
Signature · 1 line
1.7.11.7
[tip:perf/core] perf gtk/browser: Trim column header string when event group enabled
Commit-ID: 34b9564373a9e1d8c33d07824fae228a381d1803 Gitweb: http://git.kernel.org/tip/34b9564373a9e1d8c33d07824fae228a381d1803 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:42 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:48 -0300
perf gtk/browser: Trim column header string when event group enabled
When event group feature is enabled, each column header is expanded to match with the whole group column width. But this is not needed for GTK+ browser since ti usually use variable-width fonts. So trim it.
--- tools/perf/ui/gtk/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/gtk/hists.c +1 -1
@@ -170,7 +170,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists) fmt->header (&hpp);gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), --1 , s, +-1 ,ltrim (s), renderer,"markup" , col_idx++,NULL ); }
Namhyung Kim
maintainerPATCH 15/19 perf report: Bypass non-leader events when event group is enabled
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Since we have all necessary information in the leader events and other members don't, bypass members. Member events will be shown along with the leaders if event group is enabled.
--- tools/perf/builtin-report.c | 4 ++++ tools/perf/ui/browsers/hists.c | 41 +++++++++++++++++++++++++++++++++++------ tools/perf/ui/gtk/hists.c | 4 ++++ 3 files changed, 43 insertions(+), 6 deletions(-)
tools/perf/builtin-report.c +4 -0
@@ -319,6 +319,10 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,struct hists *hists = &pos->hists;const char *evname =perf_evsel__name (pos); +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) +continue ; +hists__fprintf_nr_sample_events (hists, evname, stdout);hists__fprintf (hists, true,0 ,0 , stdout);fprintf (stdout,"\n\n" );
tools/perf/ui/browsers/hists.c +35 -6
70 lines not on this page · raw message
tools/perf/ui/gtk/hists.c +4 -0
@@ -271,6 +271,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,GtkWidget *scrolled_window;GtkWidget *tab_label; +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) +continue ; + scrolled_window =gtk_scrolled_window_new (NULL ,NULL ); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
Signature · 1 line
1.7.11.7
[tip:perf/core] perf report: Bypass non-leader events when event group is enabled
Commit-ID: fc24d7c25c9d880ae012548d522fe13caee556ed Gitweb: http://git.kernel.org/tip/fc24d7c25c9d880ae012548d522fe13caee556ed Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:43 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:48 -0300
perf report: Bypass non-leader events when event group is enabled
Since we have all necessary information in the leader events and other members don't, bypass members. Member events will be shown along with the leaders if event group is enabled.
--- tools/perf/builtin-report.c | 4 ++++ tools/perf/ui/browsers/hists.c | 41 +++++++++++++++++++++++++++++++++++------ tools/perf/ui/gtk/hists.c | 4 ++++ 3 files changed, 43 insertions(+), 6 deletions(-)
tools/perf/builtin-report.c +4 -0
@@ -319,6 +319,10 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,struct hists *hists = &pos->hists;const char *evname =perf_evsel__name (pos); +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) +continue ; +hists__fprintf_nr_sample_events (hists, evname, stdout);hists__fprintf (hists, true,0 ,0 , stdout);fprintf (stdout,"\n\n" );
tools/perf/ui/browsers/hists.c +35 -6
70 lines not on this page · raw message
tools/perf/ui/gtk/hists.c +4 -0
@@ -271,6 +271,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,GtkWidget *scrolled_window;GtkWidget *tab_label; +if (symbol_conf.event_group && + !perf_evsel__is_group_leader (pos)) +continue ; + scrolled_window =gtk_scrolled_window_new (NULL ,NULL ); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
Namhyung Kim
maintainerPATCH 16/19 perf report: Show group description when event group is enabled
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
When using event group viewer, it's better to show the group description rather than the leader information alone.
If a leader did not contain any member, it's a non-group event.
--- tools/perf/builtin-report.c | 15 +++++++++++++++ tools/perf/ui/browsers/hists.c | 25 +++++++++++++++++++++++++ tools/perf/ui/gtk/hists.c | 14 +++++++++++--- tools/perf/util/evsel.c | 25 +++++++++++++++++++++++++ tools/perf/util/evsel.h | 8 ++++++++ 5 files changed, 84 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +15 -0
@@ -299,6 +299,21 @@ static size_t hists__fprintf_nr_sample_events(struct hists *self,char unit;unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = self->stats.total_period; +struct perf_evsel *evsel =hists_to_evsel (self); +char buf[512 ]; +size_t size =sizeof (buf); + +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + +perf_evsel__group_desc (evsel, buf, size); + evname = buf; + +for_each_group_member (pos, evsel) { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } + } nr_samples =convert_unit (nr_samples, &unit); ret =fprintf (fp,"# Samples: %lu%c" , nr_samples, unit);
tools/perf/ui/browsers/hists.c +25 -0
@@ -1189,6 +1189,21 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,const struct thread *thread = hists->thread_filter;unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = hists->stats.total_period; +struct perf_evsel *evsel =hists_to_evsel (hists); +char buf[512 ]; +size_t buflen =sizeof (buf); + +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + +perf_evsel__group_desc (evsel, buf, buflen); + ev_name = buf; + +for_each_group_member (pos, evsel) { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } + } nr_samples =convert_unit (nr_samples, &unit); printed = scnprintf(bf, size,
@@ -1585,6 +1600,16 @@ static void perf_evsel_menu__write(struct ui_browser *browser,ui_browser__set_color (browser, current_entry ?HE_COLORSET_SELECTED :HE_COLORSET_NORMAL ); +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + + ev_name =perf_evsel__group_name (evsel); + +for_each_group_member (pos, evsel) { + nr_events += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + } + } + nr_events =convert_unit (nr_events, &unit); printed =scnprintf (bf,sizeof (bf),"%lu%c%s%s" , nr_events, unit, unit ==' ' ?"" :" " , ev_name);
tools/perf/ui/gtk/hists.c +11 -3
@@ -270,10 +270,18 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,const char *evname =perf_evsel__name (pos);GtkWidget *scrolled_window;GtkWidget *tab_label; +char buf[512 ]; +size_t size =sizeof (buf); -if (symbol_conf.event_group && - !perf_evsel__is_group_leader (pos)) -continue ; +if (symbol_conf.event_group) { +if (!perf_evsel__is_group_leader (pos)) +continue ; + +if (pos->nr_members >1 ) { +perf_evsel__group_desc (pos, buf, size); + evname = buf; + } + } scrolled_window =gtk_scrolled_window_new (NULL ,NULL );
tools/perf/util/evsel.c +25 -0
@@ -434,6 +434,31 @@ const char *perf_evsel__name(struct perf_evsel *evsel)return evsel->name ?:"unknown" ; } +const char *perf_evsel__group_name (struct perf_evsel *evsel) +{ +return evsel->group_name ?:"anon group" ; +} + +int perf_evsel__group_desc (struct perf_evsel *evsel,char *buf,size_t size) +{ +int ret; +struct perf_evsel *pos; +const char *group_name =perf_evsel__group_name (evsel); + + ret =scnprintf (buf, size,"%s" , group_name); + + ret +=scnprintf (buf + ret, size - ret," { %s" , +perf_evsel__name (evsel)); + +for_each_group_member (pos, evsel) + ret +=scnprintf (buf + ret, size - ret,", %s" , +perf_evsel__name (pos)); + + ret +=scnprintf (buf + ret, size - ret," }" ); + +return ret; +} +/* * The enable_on_exec/disabled value strategy: *
tools/perf/util/evsel.h +8 -0
@@ -113,6 +113,8 @@ extern const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX];int __perf_evsel__hw_cache_type_op_res_name (u8 type,u8 op,u8 result,char *bf,size_t size);const char *perf_evsel__name (struct perf_evsel *evsel); +const char *perf_evsel__group_name (struct perf_evsel *evsel); +int perf_evsel__group_desc (struct perf_evsel *evsel,char *buf,size_t size);int perf_evsel__alloc_fd (struct perf_evsel *evsel,int ncpus,int nthreads);int perf_evsel__alloc_id (struct perf_evsel *evsel,int ncpus,int nthreads);
@@ -265,4 +267,10 @@ static inline int perf_evsel__group_idx(struct perf_evsel *evsel) {return evsel->idx - evsel->leader->idx; } + +#define for_each_group_member (_evsel, _leader) \ +for ((_evsel) = list_entry((_leader)->node.next, struct perf_evsel, node); \ + (_evsel) && (_evsel)->leader == (_leader); \ + (_evsel) = list_entry((_evsel)->node.next, struct perf_evsel, node)) +#endif /* __PERF_EVSEL_H */
Signature · 1 line
1.7.11.7
[tip:perf/core] perf report: Show group description when event group is enabled
Commit-ID: 717e263fc354d53d0961e952b779d14a42c8ea66 Gitweb: http://git.kernel.org/tip/717e263fc354d53d0961e952b779d14a42c8ea66 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:44 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:48 -0300
perf report: Show group description when event group is enabled
When using event group viewer, it's better to show the group description rather than the leader information alone.
If a leader did not contain any member, it's a non-group event.
--- tools/perf/builtin-report.c | 15 +++++++++++++++ tools/perf/ui/browsers/hists.c | 25 +++++++++++++++++++++++++ tools/perf/ui/gtk/hists.c | 14 +++++++++++--- tools/perf/util/evsel.c | 25 +++++++++++++++++++++++++ tools/perf/util/evsel.h | 8 ++++++++ 5 files changed, 84 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +15 -0
@@ -299,6 +299,21 @@ static size_t hists__fprintf_nr_sample_events(struct hists *self,char unit;unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = self->stats.total_period; +struct perf_evsel *evsel =hists_to_evsel (self); +char buf[512 ]; +size_t size =sizeof (buf); + +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + +perf_evsel__group_desc (evsel, buf, size); + evname = buf; + +for_each_group_member (pos, evsel) { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } + } nr_samples =convert_unit (nr_samples, &unit); ret =fprintf (fp,"# Samples: %lu%c" , nr_samples, unit);
tools/perf/ui/browsers/hists.c +25 -0
@@ -1189,6 +1189,21 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,const struct thread *thread = hists->thread_filter;unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = hists->stats.total_period; +struct perf_evsel *evsel =hists_to_evsel (hists); +char buf[512 ]; +size_t buflen =sizeof (buf); + +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + +perf_evsel__group_desc (evsel, buf, buflen); + ev_name = buf; + +for_each_group_member (pos, evsel) { + nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + nr_events += pos->hists.stats.total_period; + } + } nr_samples =convert_unit (nr_samples, &unit); printed = scnprintf(bf, size,
@@ -1585,6 +1600,16 @@ static void perf_evsel_menu__write(struct ui_browser *browser,ui_browser__set_color (browser, current_entry ?HE_COLORSET_SELECTED :HE_COLORSET_NORMAL ); +if (symbol_conf.event_group && evsel->nr_members >1 ) { +struct perf_evsel *pos; + + ev_name =perf_evsel__group_name (evsel); + +for_each_group_member (pos, evsel) { + nr_events += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE ]; + } + } + nr_events =convert_unit (nr_events, &unit); printed =scnprintf (bf,sizeof (bf),"%lu%c%s%s" , nr_events, unit, unit ==' ' ?"" :" " , ev_name);
tools/perf/ui/gtk/hists.c +11 -3
@@ -270,10 +270,18 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,const char *evname =perf_evsel__name (pos);GtkWidget *scrolled_window;GtkWidget *tab_label; +char buf[512 ]; +size_t size =sizeof (buf); -if (symbol_conf.event_group && - !perf_evsel__is_group_leader (pos)) -continue ; +if (symbol_conf.event_group) { +if (!perf_evsel__is_group_leader (pos)) +continue ; + +if (pos->nr_members >1 ) { +perf_evsel__group_desc (pos, buf, size); + evname = buf; + } + } scrolled_window =gtk_scrolled_window_new (NULL ,NULL );
tools/perf/util/evsel.c +25 -0
@@ -434,6 +434,31 @@ const char *perf_evsel__name(struct perf_evsel *evsel)return evsel->name ?:"unknown" ; } +const char *perf_evsel__group_name (struct perf_evsel *evsel) +{ +return evsel->group_name ?:"anon group" ; +} + +int perf_evsel__group_desc (struct perf_evsel *evsel,char *buf,size_t size) +{ +int ret; +struct perf_evsel *pos; +const char *group_name =perf_evsel__group_name (evsel); + + ret =scnprintf (buf, size,"%s" , group_name); + + ret +=scnprintf (buf + ret, size - ret," { %s" , +perf_evsel__name (evsel)); + +for_each_group_member (pos, evsel) + ret +=scnprintf (buf + ret, size - ret,", %s" , +perf_evsel__name (pos)); + + ret +=scnprintf (buf + ret, size - ret," }" ); + +return ret; +} +/* * The enable_on_exec/disabled value strategy: *
tools/perf/util/evsel.h +8 -0
@@ -114,6 +114,8 @@ extern const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX];int __perf_evsel__hw_cache_type_op_res_name (u8 type,u8 op,u8 result,char *bf,size_t size);const char *perf_evsel__name (struct perf_evsel *evsel); +const char *perf_evsel__group_name (struct perf_evsel *evsel); +int perf_evsel__group_desc (struct perf_evsel *evsel,char *buf,size_t size);int perf_evsel__alloc_fd (struct perf_evsel *evsel,int ncpus,int nthreads);int perf_evsel__alloc_id (struct perf_evsel *evsel,int ncpus,int nthreads);
@@ -267,4 +269,10 @@ static inline int perf_evsel__group_idx(struct perf_evsel *evsel) {return evsel->idx - evsel->leader->idx; } + +#define for_each_group_member (_evsel, _leader) \ +for ((_evsel) = list_entry((_leader)->node.next, struct perf_evsel, node); \ + (_evsel) && (_evsel)->leader == (_leader); \ + (_evsel) = list_entry((_evsel)->node.next, struct perf_evsel, node)) +#endif /* __PERF_EVSEL_H */
Namhyung Kim
maintainerPATCH 17/19 perf report: Add --group option
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Add --group option to enable event grouping. When enabled, all the group members information will be shown together with the leader.
$ perf report --group
...
# group: {ref-cycles,cycles}
# ========
#
# Samples: 7K of event 'anon group { ref-cycles, cycles }'
# Event count (approx.): 6876107743
#
# Overhead Command Shared Object Symbol
# ................ ....... ................. ..........................
#
99.84% 99.76% noploop noploop [.] main
0.07% 0.00% noploop ld-2.15.so [.] strcmp
0.03% 0.00% noploop [kernel.kallsyms] [k] timerqueue_del
0.03% 0.03% noploop [kernel.kallsyms] [k] sched_clock_cpu
0.02% 0.00% noploop [kernel.kallsyms] [k] account_user_time
0.01% 0.00% noploop [kernel.kallsyms] [k] __alloc_pages_nodemask
0.00% 0.00% noploop [kernel.kallsyms] [k] native_write_msr_safe
0.00% 0.11% noploop [kernel.kallsyms] [k] _raw_spin_lock
0.00% 0.06% noploop [kernel.kallsyms] [k] find_get_page
0.00% 0.02% noploop [kernel.kallsyms] [k] rcu_check_callbacks
0.00% 0.02% noploop [kernel.kallsyms] [k] __current_kernel_time--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/builtin-report.c | 2 ++ 2 files changed, 5 insertions(+)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -203,6 +203,9 @@ OPTIONS --objdump=<path>:: Path to objdump binary. +--group:: + Show event group information together. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-annotate[1]
tools/perf/builtin-report.c +2 -0
@@ -668,6 +668,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) "Specify disassembler style (e.g. -M intel for intel syntax)"),OPT_BOOLEAN (0 ,"show-total-period" , &symbol_conf.show_total_period,"Show a column with the sum of periods" ), +OPT_BOOLEAN (0 ,"group" , &symbol_conf.event_group, +"Show event group information together" ),OPT_CALLBACK_NOOPT ('b' ,"branch-stack" , &sort__branch_mode,"" ,"use branch records for histogram filling" , parse_branch_mode), OPT_STRING(0, "objdump", &objdump_path, "path",
Signature · 1 line
1.7.11.7
[tip:perf/core] perf report: Add --group option
Commit-ID: 01d14f1615dfe1c6d040541501445967ac716009 Gitweb: http://git.kernel.org/tip/01d14f1615dfe1c6d040541501445967ac716009 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:45 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:49 -0300
perf report: Add --group option
Add --group option to enable event grouping. When enabled, all the group members information will be shown together with the leader.
$ perf report --group
...
# group: {ref-cycles,cycles}
# ========
#
# Samples: 7K of event 'anon group { ref-cycles, cycles }'
# Event count (approx.): 6876107743
#
# Overhead Command Shared Object Symbol
# ................ ....... ................. ..........................
#
99.84% 99.76% noploop noploop [.] main
0.07% 0.00% noploop ld-2.15.so [.] strcmp
0.03% 0.00% noploop [kernel.kallsyms] [k] timerqueue_del
0.03% 0.03% noploop [kernel.kallsyms] [k] sched_clock_cpu
0.02% 0.00% noploop [kernel.kallsyms] [k] account_user_time
0.01% 0.00% noploop [kernel.kallsyms] [k] __alloc_pages_nodemask
0.00% 0.00% noploop [kernel.kallsyms] [k] native_write_msr_safe
0.00% 0.11% noploop [kernel.kallsyms] [k] _raw_spin_lock
0.00% 0.06% noploop [kernel.kallsyms] [k] find_get_page
0.00% 0.02% noploop [kernel.kallsyms] [k] rcu_check_callbacks
0.00% 0.02% noploop [kernel.kallsyms] [k] __current_kernel_time--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/builtin-report.c | 2 ++ 2 files changed, 5 insertions(+)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -203,6 +203,9 @@ OPTIONS --objdump=<path>:: Path to objdump binary. +--group:: + Show event group information together. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-annotate[1]
tools/perf/builtin-report.c +2 -0
@@ -668,6 +668,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) "Specify disassembler style (e.g. -M intel for intel syntax)"),OPT_BOOLEAN (0 ,"show-total-period" , &symbol_conf.show_total_period,"Show a column with the sum of periods" ), +OPT_BOOLEAN (0 ,"group" , &symbol_conf.event_group, +"Show event group information together" ),OPT_CALLBACK_NOOPT ('b' ,"branch-stack" , &sort__branch_mode,"" ,"use branch records for histogram filling" , parse_branch_mode), OPT_STRING(0, "objdump", &objdump_path, "path",
Namhyung Kim
maintainerPATCH 18/19 perf report: Add report.group config option
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Add report.group config option for setting default value of event group view. It affects the report output only if perf.data contains event group info.
A user can write .perfconfig file like below to enable group view by default:
$ cat ~/.perfconfig [report] group = true
And it can be disabled through command line:
$ perf report --no-group
--- tools/perf/builtin-report.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/perf/builtin-report.c +13 -0
@@ -8,6 +8,7 @@#include "builtin.h" #include "util/util.h" +#include "util/cache.h" #include "util/annotate.h" #include "util/color.h"
@@ -54,6 +55,16 @@ struct perf_report {DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS ); }; +static int perf_report_config (const char *var,const char *value,void *cb) +{ +if (!strcmp (var,"report.group" )) { + symbol_conf.event_group =perf_config_bool (var, value); +return 0 ; + } + +return perf_default_config (var, value, cb); +} + static int perf_report__add_branch_hist_entry(struct perf_tool *tool, struct addr_location *al, struct perf_sample *sample,
@@ -677,6 +688,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) OPT_END() }; +perf_config (perf_report_config,NULL ); + argc =parse_options (argc, argv, options, report_usage,0 );if (report.use_stdio)
Signature · 1 line
1.7.11.7
[tip:perf/core] perf report: Add report.group config option
Commit-ID: 00c7e1f10c6b8ae8a031f5c6a58ecd15d20c52cb Gitweb: http://git.kernel.org/tip/00c7e1f10c6b8ae8a031f5c6a58ecd15d20c52cb Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:46 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:49 -0300
perf report: Add report.group config option
Add report.group config option for setting default value of event group view. It affects the report output only if perf.data contains event group info.
A user can write .perfconfig file like below to enable group view by default:
$ cat ~/.perfconfig [report] group = true
And it can be disabled through command line:
$ perf report --no-group
--- tools/perf/builtin-report.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/perf/builtin-report.c +13 -0
@@ -8,6 +8,7 @@#include "builtin.h" #include "util/util.h" +#include "util/cache.h" #include "util/annotate.h" #include "util/color.h"
@@ -54,6 +55,16 @@ struct perf_report {DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS ); }; +static int perf_report_config (const char *var,const char *value,void *cb) +{ +if (!strcmp (var,"report.group" )) { + symbol_conf.event_group =perf_config_bool (var, value); +return 0 ; + } + +return perf_default_config (var, value, cb); +} + static int perf_report__add_branch_hist_entry(struct perf_tool *tool, struct addr_location *al, struct perf_sample *sample,
@@ -677,6 +688,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) OPT_END() }; +perf_config (perf_report_config,NULL ); + argc =parse_options (argc, argv, options, report_usage,0 );if (report.use_stdio)
Namhyung Kim
maintainerPATCH 19/19 perf evlist: Add --group option
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Add '-g/--group' option for showing event groups. For simplicity it is currently not compatible with other options.
$ perf evlist --group
{ref-cycles,cycles}$ perf evlist ref-cycles cycles
--- tools/perf/Documentation/perf-evlist.txt | 4 ++++ tools/perf/builtin-evlist.c | 7 +++++++ tools/perf/util/evsel.c | 24 ++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-evlist.txt +4 -0
@@ -28,6 +28,10 @@ OPTIONS --verbose=:: Show all fields. +-g:: +--group:: + Show event group information. + SEE ALSO -------- linkperf:perf-record[1], linkperf:perf-list[1],
tools/perf/builtin-evlist.c +7 -0
@@ -39,6 +39,8 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused)OPT_BOOLEAN ('F' ,"freq" , &details.freq,"Show the sample frequency" ),OPT_BOOLEAN ('v' ,"verbose" , &details.verbose,"Show all event attr details" ), +OPT_BOOLEAN ('g' ,"group" , &symbol_conf.event_group, +"Show event group information" ),OPT_END () }; const char * const evlist_usage[] = {
@@ -50,5 +52,10 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused)if (argc)usage_with_options (evlist_usage, options); +if (symbol_conf.event_group && (details.verbose || details.freq)) { +pr_err ("--group option is not compatible with other options\n" ); +usage_with_options (evlist_usage, options); + } +return __cmd_evlist (input_name, &details); }
tools/perf/util/evsel.c +22 -2
@@ -1358,7 +1358,27 @@ int perf_evsel__fprintf(struct perf_evsel *evsel, struct perf_attr_details *details, FILE *fp) { bool first = true; -int printed =fprintf (fp,"%s" ,perf_evsel__name (evsel)); +int printed =0 ; + +if (symbol_conf.event_group) { +struct perf_evsel *pos; + +if (!perf_evsel__is_group_leader (evsel)) +return 0 ; + +if (evsel->nr_members >1 ) + printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + + printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel)); +for_each_group_member (pos, evsel) + printed +=fprintf (fp,",%s" ,perf_evsel__name (pos)); + +if (evsel->nr_members >1 ) + printed +=fprintf (fp,"}" ); + goto out; + } + + printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel)); if (details->verbose || details->freq) { printed += comma_fprintf(fp, &first, " sample_freq=%" PRIu64,
@@ -1399,7 +1419,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,if_print (bp_type);if_print (branch_sample_type); } - +out:fputc ('\n' , fp);return ++printed; }
Signature · 1 line
1.7.11.7
[tip:perf/core] perf evlist: Add --group option
Commit-ID: e6ab07d027d47e55d8a5c0f33b16dfdd3e18c96f Gitweb: http://git.kernel.org/tip/e6ab07d027d47e55d8a5c0f33b16dfdd3e18c96f Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 22 Jan 2013 18:09:47 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 31 Jan 2013 13:07:49 -0300
perf evlist: Add --group option
Add '-g/--group' option for showing event groups. For simplicity it is currently not compatible with other options.
$ perf evlist --group
{ref-cycles,cycles}$ perf evlist ref-cycles cycles
--- tools/perf/Documentation/perf-evlist.txt | 4 ++++ tools/perf/builtin-evlist.c | 7 +++++++ tools/perf/util/evsel.c | 24 ++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-evlist.txt +4 -0
@@ -28,6 +28,10 @@ OPTIONS --verbose=:: Show all fields. +-g:: +--group:: + Show event group information. + SEE ALSO -------- linkperf:perf-record[1], linkperf:perf-list[1],
tools/perf/builtin-evlist.c +7 -0
@@ -39,6 +39,8 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused)OPT_BOOLEAN ('F' ,"freq" , &details.freq,"Show the sample frequency" ),OPT_BOOLEAN ('v' ,"verbose" , &details.verbose,"Show all event attr details" ), +OPT_BOOLEAN ('g' ,"group" , &symbol_conf.event_group, +"Show event group information" ),OPT_END () }; const char * const evlist_usage[] = {
@@ -50,5 +52,10 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused)if (argc)usage_with_options (evlist_usage, options); +if (symbol_conf.event_group && (details.verbose || details.freq)) { +pr_err ("--group option is not compatible with other options\n" ); +usage_with_options (evlist_usage, options); + } +return __cmd_evlist (input_name, &details); }
tools/perf/util/evsel.c +22 -2
@@ -1389,7 +1389,27 @@ int perf_evsel__fprintf(struct perf_evsel *evsel, struct perf_attr_details *details, FILE *fp) { bool first = true; -int printed =fprintf (fp,"%s" ,perf_evsel__name (evsel)); +int printed =0 ; + +if (symbol_conf.event_group) { +struct perf_evsel *pos; + +if (!perf_evsel__is_group_leader (evsel)) +return 0 ; + +if (evsel->nr_members >1 ) + printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + + printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel)); +for_each_group_member (pos, evsel) + printed +=fprintf (fp,",%s" ,perf_evsel__name (pos)); + +if (evsel->nr_members >1 ) + printed +=fprintf (fp,"}" ); + goto out; + } + + printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel)); if (details->verbose || details->freq) { printed += comma_fprintf(fp, &first, " sample_freq=%" PRIu64,
@@ -1430,7 +1450,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,if_print (bp_type);if_print (branch_sample_type); } - +out:fputc ('\n' , fp);return ++printed; }