perf_counter tools: filter by comm, dso & symbol lists Linux Kernel Mailing List <[email protected]>
cover perf_counter tools: filter by comm, dso & symbol lists Linux Kernel Mailing List <[email protected]>
Hi,
The following patches allows filtering by comm, dso & symbol
lists, in a way similar to oprofile image: parameters.
Regards,
- Arnaldo
PATCH 1/3 perf_counter tools: Add --dsos parameter to 'perf report'
So that we can filter by dso. Symbols in other dsos won't be accounted for.
--- tools/perf/Documentation/perf-report.txt | 4 + tools/perf/Makefile | 2 + tools/perf/builtin-report.c | 16 +++ tools/perf/util/strlist.c | 184 ++++++++++++++++++++++++++++++ tools/perf/util/strlist.h | 32 +++++ 5 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 tools/perf/util/strlist.c create mode 100644 tools/perf/util/strlist.h
tools/perf/Documentation/perf-report.txt +4 -0
@@ -20,6 +20,10 @@ OPTIONS -i:: --input=:: Input file name. (default: perf.data) +-d:: +--dsos=:: + Only consider symbols in these dsos. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/Makefile +2 -0
@@ -301,6 +301,7 @@ LIB_H += util/util.h LIB_H += util/help.h LIB_H += util/strbuf.h LIB_H += util/string.h +LIB_H += util/strlist.h LIB_H += util/run-command.h LIB_H += util/sigchain.h LIB_H += util/symbol.h
@@ -322,6 +323,7 @@ LIB_OBJS += util/run-command.o LIB_OBJS += util/quote.o LIB_OBJS += util/strbuf.o LIB_OBJS += util/string.o +LIB_OBJS += util/strlist.o LIB_OBJS += util/usage.o LIB_OBJS += util/wrapper.o LIB_OBJS += util/sigchain.o
tools/perf/builtin-report.c +16 -0
@@ -16,6 +16,7 @@#include "util/symbol.h" #include "util/string.h" #include "util/callchain.h" +#include "util/strlist.h" #include "perf.h" #include "util/header.h"
@@ -32,6 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; +static char *dso_list_str; +static struct strlist *dso_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1272,6 +1275,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (show & show_mask) {struct symbol *sym =resolve_symbol (thread, &map, &dso, &ip); +if (dso_list && dso && dso->name && !strlist__has_entry (dso_list, dso->name)) +return 0 ; +if (hist_entry__add (thread, map, dso, sym, ip, chain, level, period)) {eprintf ("problem incrementing symbol count, skipping event\n" );return -1 ;
@@ -1659,6 +1665,8 @@ static const struct option options[] = {OPT_BOOLEAN ('x' ,"exclude-other" , &exclude_other,"Only display entries with parent-match" ),OPT_BOOLEAN ('c' ,"callchain" , &callchain,"Display callchains" ), +OPT_STRING ('d' ,"dsos" , &dso_list_str,"dso[,dso...]" , +"only consider symbols in these dsos" ), OPT_END() };
@@ -1698,6 +1706,14 @@ int cmd_report(int argc, const char **argv, const char *prefix)if (argc)usage_with_options (report_usage, options); +if (dso_list_str) { + dso_list =strlist__new (true, dso_list_str); +if (!dso_list) { +fprintf (stderr,"problems parsing dso list\n" ); +exit (129 ); + } + } +setup_pager ();return __cmd_report ();
tools/perf/util/strlist.c new file +184 -0
184 lines not on this page · raw message
tools/perf/util/strlist.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef STRLIST_H_ +#define STRLIST_H_ + +#include "rbtree.h" +#include <stdbool.h> + +struct str_node { +struct rb_node rb_node; +const char *s; +}; + +struct strlist { +struct rb_root entries; +bool dupstr; +}; + +struct strlist *strlist__new (bool dupstr,const char *slist); +void strlist__delete (struct strlist *self); + +void strlist__remove (struct strlist *self,struct str_node *sn); +int strlist__load (struct strlist *self,const char *filename); +int strlist__add (struct strlist *self,const char *str); + +bool strlist__has_entry (struct strlist *self,const char *entry); + +static inline bool strlist__empty (const struct strlist *self) +{ +return rb_first (&self->entries) ==NULL ; +} + +int strlist__parse_list (struct strlist *self,const char *s); +#endif /* STRLIST_H_ */
Signature · 1 line
1.6.2.5
PATCH 2/3 perf_counter tools: Add --comms parameter to 'perf report'
So that we can filter by comm. Symbols in other comms won't be accounted for.
--- tools/perf/Documentation/perf-report.txt | 4 +++ tools/perf/builtin-report.c | 33 ++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-)
tools/perf/Documentation/perf-report.txt +4 -0
@@ -24,6 +24,10 @@ OPTIONS --dsos=:: Only consider symbols in these dsos. CSV that understands file://filename entries. +-C:: +--comms=:: + Only consider symbols in these comms. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/builtin-report.c +23 -10
@@ -33,8 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; -static char *dso_list_str; -static struct strlist *dso_list; +static char *dso_list_str, *comm_list_str; +static struct strlist *dso_list, *comm_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -240,7 +240,7 @@ static u64 vdso__map_ip(struct map *map, u64 ip)static inline int is_anon_memory (const char *filename) { -return strcmp (filename,"//anon" ) ==0 ; +return strcmp (filename,"//anon" ) ==0 ; }static struct map *map__new (struct mmap_event *event)
@@ -1253,6 +1253,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)return -1 ; } +if (comm_list && !strlist__has_entry (comm_list, thread->comm)) +return 0 ; +if (event->header.misc &PERF_EVENT_MISC_KERNEL ) { show =SHOW_KERNEL ; level ='k' ;
@@ -1667,6 +1670,8 @@ static const struct option options[] = {OPT_BOOLEAN ('c' ,"callchain" , &callchain,"Display callchains" ),OPT_STRING ('d' ,"dsos" , &dso_list_str,"dso[,dso...]" ,"only consider symbols in these dsos" ), +OPT_STRING ('C' ,"comms" , &comm_list_str,"comm[,comm...]" , +"only consider symbols in these comms" ), OPT_END() };
@@ -1685,6 +1690,19 @@ static void setup_sorting(void)free (str); } +static void setup_list (struct strlist **list,const char *list_str, +const char *list_name) +{ +if (list_str) { + *list =strlist__new (true, list_str); +if (!*list) { +fprintf (stderr,"problems parsing %s list\n" , + list_name); +exit (129 ); + } + } +} +int cmd_report (int argc,const char **argv,const char *prefix) {symbol__init ();
@@ -1706,13 +1724,8 @@ int cmd_report(int argc, const char **argv, const char *prefix)if (argc)usage_with_options (report_usage, options); -if (dso_list_str) { - dso_list =strlist__new (true, dso_list_str); -if (!dso_list) { -fprintf (stderr,"problems parsing dso list\n" ); -exit (129 ); - } - } +setup_list (&dso_list, dso_list_str,"dso" ); +setup_list (&comm_list, comm_list_str,"comm" );setup_pager ();
Signature · 1 line
1.6.2.5
PATCH 3/3 perf_counter tools: Add --symbols parameter to 'perf report'
So that we can filter by symbol name.
The 'pfunct' utility in the 'dwarves' package can be used to create a file with the functions one wants.
Example:
[acme@doppio pahole]$ pfunct /usr/lib/debug/usr/lib64/libdw-0.141.so.debug | grep dwarf > /tmp/dwarf.symbols [acme@doppio pahole]$ wc -l /tmp/dwarf.symbols
93 /tmp/dwarf.symbols
[acme@doppio pahole]$ head -3 /tmp/dwarf.symbolsdwfl_addrdwarfdwfl_module_getdwarfdwfl_getdwarf
[acme@doppio pahole]$ perf report --sort comm,dso,symbol --comms pahole --dsos /usr/lib64/libdw-0.141.so --symbols file:///tmp/dwarf.symbols
33.99% pahole /usr/lib64/libdw-0.141.so [.] dwarf_tag
29.07% pahole /usr/lib64/libdw-0.141.so [.] dwarf_decl_file
27.71% pahole /usr/lib64/libdw-0.141.so [.] dwarf_getsrclines
4.54% pahole /usr/lib64/libdw-0.141.so 0x00000000007400
3.93% pahole /usr/lib64/libdw-0.141.so [.] dwarf_decl_line
0.46% pahole /usr/lib64/libdw-0.141.so [.] dwarf_getlocation
0.18% pahole /usr/lib64/libdw-0.141.so [.] __libdwarf_next_prime
0.13% pahole /usr/lib64/libdw-0.141.so [.] dwarf_diecu[acme@doppio pahole]$
--- tools/perf/Documentation/perf-report.txt | 4 ++++ tools/perf/builtin-report.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-report.txt +4 -0
@@ -28,6 +28,10 @@ OPTIONS --comms=:: Only consider symbols in these comms. CSV that understands file://filename entries. +-S:: +--symbols=:: + Only consider these symbols. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/builtin-report.c +8 -2
@@ -33,8 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; -static char *dso_list_str, *comm_list_str; -static struct strlist *dso_list, *comm_list; +static char *dso_list_str, *comm_list_str, *sym_list_str; +static struct strlist *dso_list, *comm_list, *sym_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1281,6 +1281,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (dso_list && dso && dso->name && !strlist__has_entry (dso_list, dso->name))return 0 ; +if (sym_list && sym && !strlist__has_entry (sym_list, sym->name)) +return 0 ; +if (hist_entry__add (thread, map, dso, sym, ip, chain, level, period)) {eprintf ("problem incrementing symbol count, skipping event\n" );return -1 ;
@@ -1672,6 +1675,8 @@ static const struct option options[] = { "only consider symbols in these dsos"),OPT_STRING ('C' ,"comms" , &comm_list_str,"comm[,comm...]" ,"only consider symbols in these comms" ), +OPT_STRING ('S' ,"symbols" , &sym_list_str,"symbol[,symbol...]" , +"only consider these symbols" ), OPT_END() };
@@ -1726,6 +1731,7 @@ int cmd_report(int argc, const char **argv, const char *prefix)setup_list (&dso_list, dso_list_str,"dso" );setup_list (&comm_list, comm_list_str,"comm" ); +setup_list (&sym_list, sym_list_str,"symbol" );setup_pager ();
Signature · 1 line
1.6.2.5
[tip:perfcounters/urgent] perf report: Add --symbols parameter
Commit-ID: 7bec7a9134c25cecb0d7029199b59f7b1bef35b8 Gitweb: http://git.kernel.org/tip/7bec7a9134c25cecb0d7029199b59f7b1bef35b8 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 30 Jun 2009 19:01:22 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Jul 2009 00:07:10 +0200
perf report: Add --symbols parameter
So that we can filter by symbol name.
The 'pfunct' utility in the 'dwarves' package can be used to create a file with the functions one wants.
Example:
[acme@doppio pahole]$ pfunct /usr/lib/debug/usr/lib64/libdw-0.141.so.debug | grep dwarf > /tmp/dwarf.symbols [acme@doppio pahole]$ wc -l /tmp/dwarf.symbols
93 /tmp/dwarf.symbols
[acme@doppio pahole]$ head -3 /tmp/dwarf.symbolsdwfl_addrdwarfdwfl_module_getdwarfdwfl_getdwarf
[acme@doppio pahole]$ perf report --sort comm,dso,symbol --comms pahole --dsos /usr/lib64/libdw-0.141.so --symbols file:///tmp/dwarf.symbols
33.99% pahole /usr/lib64/libdw-0.141.so [.] dwarf_tag
29.07% pahole /usr/lib64/libdw-0.141.so [.] dwarf_decl_file
27.71% pahole /usr/lib64/libdw-0.141.so [.] dwarf_getsrclines
4.54% pahole /usr/lib64/libdw-0.141.so 0x00000000007400
3.93% pahole /usr/lib64/libdw-0.141.so [.] dwarf_decl_line
0.46% pahole /usr/lib64/libdw-0.141.so [.] dwarf_getlocation
0.18% pahole /usr/lib64/libdw-0.141.so [.] __libdwarf_next_prime
0.13% pahole /usr/lib64/libdw-0.141.so [.] dwarf_diecu[acme@doppio pahole]$
LKML-Reference: <[email protected]>
--- tools/perf/Documentation/perf-report.txt | 4 ++++ tools/perf/builtin-report.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-report.txt +4 -0
@@ -28,6 +28,10 @@ OPTIONS --comms=:: Only consider symbols in these comms. CSV that understands file://filename entries. +-S:: +--symbols=:: + Only consider these symbols. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/builtin-report.c +8 -2
@@ -33,8 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; -static char *dso_list_str, *comm_list_str; -static struct strlist *dso_list, *comm_list; +static char *dso_list_str, *comm_list_str, *sym_list_str; +static struct strlist *dso_list, *comm_list, *sym_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1281,6 +1281,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (dso_list && dso && dso->name && !strlist__has_entry (dso_list, dso->name))return 0 ; +if (sym_list && sym && !strlist__has_entry (sym_list, sym->name)) +return 0 ; +if (hist_entry__add (thread, map, dso, sym, ip, chain, level, period)) {eprintf ("problem incrementing symbol count, skipping event\n" );return -1 ;
@@ -1672,6 +1675,8 @@ static const struct option options[] = { "only consider symbols in these dsos"),OPT_STRING ('C' ,"comms" , &comm_list_str,"comm[,comm...]" ,"only consider symbols in these comms" ), +OPT_STRING ('S' ,"symbols" , &sym_list_str,"symbol[,symbol...]" , +"only consider these symbols" ), OPT_END() };
@@ -1726,6 +1731,7 @@ int cmd_report(int argc, const char **argv, const char *prefix)setup_list (&dso_list, dso_list_str,"dso" );setup_list (&comm_list, comm_list_str,"comm" ); +setup_list (&sym_list, sym_list_str,"symbol" );setup_pager ();
[tip:perfcounters/urgent] perf report: Add --comms parameter
In reply to Arnaldo Carvalho de MeloCommit-ID: cc8b88b15ab8e5ae162a46c4b6b286b555190dd1 Gitweb: http://git.kernel.org/tip/cc8b88b15ab8e5ae162a46c4b6b286b555190dd1 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 30 Jun 2009 19:01:21 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Jul 2009 00:07:10 +0200
perf report: Add --comms parameter
So that we can filter by comm. Symbols in other comms won't be accounted for.
LKML-Reference: <[email protected]>
--- tools/perf/Documentation/perf-report.txt | 4 +++ tools/perf/builtin-report.c | 33 ++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-)
tools/perf/Documentation/perf-report.txt +4 -0
@@ -24,6 +24,10 @@ OPTIONS --dsos=:: Only consider symbols in these dsos. CSV that understands file://filename entries. +-C:: +--comms=:: + Only consider symbols in these comms. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/builtin-report.c +23 -10
@@ -33,8 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; -static char *dso_list_str; -static struct strlist *dso_list; +static char *dso_list_str, *comm_list_str; +static struct strlist *dso_list, *comm_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -240,7 +240,7 @@ static u64 vdso__map_ip(struct map *map, u64 ip)static inline int is_anon_memory (const char *filename) { -return strcmp (filename,"//anon" ) ==0 ; +return strcmp (filename,"//anon" ) ==0 ; }static struct map *map__new (struct mmap_event *event)
@@ -1253,6 +1253,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)return -1 ; } +if (comm_list && !strlist__has_entry (comm_list, thread->comm)) +return 0 ; +if (event->header.misc &PERF_EVENT_MISC_KERNEL ) { show =SHOW_KERNEL ; level ='k' ;
@@ -1667,6 +1670,8 @@ static const struct option options[] = {OPT_BOOLEAN ('c' ,"callchain" , &callchain,"Display callchains" ),OPT_STRING ('d' ,"dsos" , &dso_list_str,"dso[,dso...]" ,"only consider symbols in these dsos" ), +OPT_STRING ('C' ,"comms" , &comm_list_str,"comm[,comm...]" , +"only consider symbols in these comms" ), OPT_END() };
@@ -1685,6 +1690,19 @@ static void setup_sorting(void)free (str); } +static void setup_list (struct strlist **list,const char *list_str, +const char *list_name) +{ +if (list_str) { + *list =strlist__new (true, list_str); +if (!*list) { +fprintf (stderr,"problems parsing %s list\n" , + list_name); +exit (129 ); + } + } +} +int cmd_report (int argc,const char **argv,const char *prefix) {symbol__init ();
@@ -1706,13 +1724,8 @@ int cmd_report(int argc, const char **argv, const char *prefix)if (argc)usage_with_options (report_usage, options); -if (dso_list_str) { - dso_list =strlist__new (true, dso_list_str); -if (!dso_list) { -fprintf (stderr,"problems parsing dso list\n" ); -exit (129 ); - } - } +setup_list (&dso_list, dso_list_str,"dso" ); +setup_list (&comm_list, comm_list_str,"comm" );setup_pager ();
[tip:perfcounters/urgent] perf report: Add --dsos parameter
In reply to Arnaldo Carvalho de MeloCommit-ID: 25903407da21552419e0955705d6d8c8e601cb2e Gitweb: http://git.kernel.org/tip/25903407da21552419e0955705d6d8c8e601cb2e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 30 Jun 2009 19:01:20 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Jul 2009 00:07:09 +0200
perf report: Add --dsos parameter
So that we can filter by dso. Symbols in other dsos won't be accounted for.
LKML-Reference: <[email protected]>
--- tools/perf/Documentation/perf-report.txt | 4 + tools/perf/Makefile | 2 + tools/perf/builtin-report.c | 16 +++ tools/perf/util/strlist.c | 184 ++++++++++++++++++++++++++++++ tools/perf/util/strlist.h | 32 +++++ 5 files changed, 238 insertions(+), 0 deletions(-)
tools/perf/Documentation/perf-report.txt +4 -0
@@ -20,6 +20,10 @@ OPTIONS -i:: --input=:: Input file name. (default: perf.data) +-d:: +--dsos=:: + Only consider symbols in these dsos. CSV that understands + file://filename entries. SEE ALSO --------
tools/perf/Makefile +2 -0
@@ -301,6 +301,7 @@ LIB_H += util/util.h LIB_H += util/help.h LIB_H += util/strbuf.h LIB_H += util/string.h +LIB_H += util/strlist.h LIB_H += util/run-command.h LIB_H += util/sigchain.h LIB_H += util/symbol.h
@@ -322,6 +323,7 @@ LIB_OBJS += util/run-command.o LIB_OBJS += util/quote.o LIB_OBJS += util/strbuf.o LIB_OBJS += util/string.o +LIB_OBJS += util/strlist.o LIB_OBJS += util/usage.o LIB_OBJS += util/wrapper.o LIB_OBJS += util/sigchain.o
tools/perf/builtin-report.c +16 -0
@@ -16,6 +16,7 @@#include "util/symbol.h" #include "util/string.h" #include "util/callchain.h" +#include "util/strlist.h" #include "perf.h" #include "util/header.h"
@@ -32,6 +33,8 @@ static char *vmlinux = NULL;static char default_sort_order[] ="comm,dso" ;static char *sort_order = default_sort_order; +static char *dso_list_str; +static struct strlist *dso_list;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1272,6 +1275,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (show & show_mask) {struct symbol *sym =resolve_symbol (thread, &map, &dso, &ip); +if (dso_list && dso && dso->name && !strlist__has_entry (dso_list, dso->name)) +return 0 ; +if (hist_entry__add (thread, map, dso, sym, ip, chain, level, period)) {eprintf ("problem incrementing symbol count, skipping event\n" );return -1 ;
@@ -1659,6 +1665,8 @@ static const struct option options[] = {OPT_BOOLEAN ('x' ,"exclude-other" , &exclude_other,"Only display entries with parent-match" ),OPT_BOOLEAN ('c' ,"callchain" , &callchain,"Display callchains" ), +OPT_STRING ('d' ,"dsos" , &dso_list_str,"dso[,dso...]" , +"only consider symbols in these dsos" ), OPT_END() };
@@ -1698,6 +1706,14 @@ int cmd_report(int argc, const char **argv, const char *prefix)if (argc)usage_with_options (report_usage, options); +if (dso_list_str) { + dso_list =strlist__new (true, dso_list_str); +if (!dso_list) { +fprintf (stderr,"problems parsing dso list\n" ); +exit (129 ); + } + } +setup_pager ();return __cmd_report ();
tools/perf/util/strlist.c new file +184 -0
184 lines not on this page · raw message
tools/perf/util/strlist.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef STRLIST_H_ +#define STRLIST_H_ + +#include "rbtree.h" +#include <stdbool.h> + +struct str_node { +struct rb_node rb_node; +const char *s; +}; + +struct strlist { +struct rb_root entries; +bool dupstr; +}; + +struct strlist *strlist__new (bool dupstr,const char *slist); +void strlist__delete (struct strlist *self); + +void strlist__remove (struct strlist *self,struct str_node *sn); +int strlist__load (struct strlist *self,const char *filename); +int strlist__add (struct strlist *self,const char *str); + +bool strlist__has_entry (struct strlist *self,const char *entry); + +static inline bool strlist__empty (const struct strlist *self) +{ +return rb_first (&self->entries) ==NULL ; +} + +int strlist__parse_list (struct strlist *self,const char *s); +#endif /* STRLIST_H_ */
Quoted 4 lines · Arnaldo Carvalho de Melo
Hi,
The following patches allows filtering by comm, dso &
symbol lists, in a way similar to oprofile image: parameters.
Cool, thanks Arnaldo! Applied to tip:perfcounters/urgent.
Ingo