perf report: Tidy up reporting of symbols not found
PATCH 1/5 perf report: Tidy up reporting of symbols not found
Always printing the level info about if it is in the kernel, hypervisor or userspace as that is in the hist_entry.
--- tools/perf/builtin-report.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +2 -3
@@ -705,10 +705,9 @@ sort__sym_print(FILE *fp, struct hist_entry *self, unsigned int width __used)if (verbose) ret +=repsep_fprintf (fp,"%#018llx " , (u64 )self->ip); + ret +=repsep_fprintf (fp,"[%c] " , self->level);if (self->sym) { - ret +=repsep_fprintf (fp,"[%c] %s" , - self->dso == kernel_dso ?'k' : - self->dso == hypervisor_dso ?'h' :'.' , self->sym->name); + ret +=repsep_fprintf (fp,"%s" , self->sym->name);if (self->sym->module) ret += repsep_fprintf(fp, "\t[%s]",
Signature · 1 line
1.6.2.5
PATCH 2/5 strlist: Introduce strlist__entry and strlist__nr_entries methods
The strlist__entry method allows accessing strlists like an array, will be used in the 'perf report' to access the first entry.
We now keep the nr_entries so that we can check if we have just one entry, will be used in 'perf report' to improve the output by showing just at the top when we have just, say, one DSO.
While at it use nr_entries to optimize strlist__is_empty by not using the far more costly rb_first based implementation.
--- tools/perf/util/strlist.c | 20 ++++++++++++++++++-- tools/perf/util/strlist.h | 11 +++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-)
tools/perf/util/strlist.c +18 -2
@@ -64,6 +64,7 @@ int strlist__add(struct strlist *self, const char *new_entry)rb_link_node (&sn->rb_node, parent, p);rb_insert_color (&sn->rb_node, &self->entries); + ++self->nr_entries;return 0 ; }
@@ -155,8 +156,9 @@ struct strlist *strlist__new(bool dupstr, const char *slist)struct strlist *self =malloc (sizeof (*self));if (self !=NULL ) { - self->entries =RB_ROOT ; - self->dupstr = dupstr; + self->entries =RB_ROOT ; + self->dupstr = dupstr; + self->nr_entries =0 ;if (slist &&strlist__parse_list (self, slist) !=0 ) goto out_error; }
@@ -182,3 +184,17 @@ void strlist__delete(struct strlist *self)free (self); } } + +struct str_node *strlist__entry (const struct strlist *self,unsigned int idx) +{ +struct rb_node *nd; + +for (nd =rb_first (&self->entries); nd; nd =rb_next (nd)) { + struct str_node *pos = rb_entry(nd, struct str_node, rb_node); + +if (!idx--) +return pos; + } + +return NULL ; +}
tools/perf/util/strlist.h +9 -2
@@ -11,7 +11,8 @@ struct str_node {struct strlist {struct rb_root entries; -bool dupstr; +unsigned int nr_entries; +bool dupstr; };struct strlist *strlist__new (bool dupstr,const char *slist);
@@ -21,11 +22,17 @@ 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); +struct str_node *strlist__entry (const struct strlist *self,unsigned int idx);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 ; +return self->nr_entries ==0 ; +} + +static inline unsigned int strlist__nr_entries (const struct strlist *self) +{ +return self->nr_entries; }int strlist__parse_list (struct strlist *self,const char *s);
Signature · 1 line
1.6.2.5
PATCH 3/5 perf report: Make the output more compact
When we filter by column content we may end up with a column that has the same value for all the lines. So remove that column and tell its unique value on the top, as a comment.
Example:
[acme@doppio pahole]$ perf report --sort comm,dso,symbol -d ./build/libdwarves.so.1.0.0 -C pahole | head -15
20.93% [.] tag__recode_dwarf_type
14.94% [.] namespace__recode_dwarf_types
10.38% [.] cu__table_add_tag
6.69% [.] __die__process_tag
5.05% [.] die__process_function
4.70% [.] list__for_all_tags
3.68% [.] tag__init
3.48% [.] die__create_new_parameter[acme@doppio pahole]$
--- tools/perf/builtin-report.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)
tools/perf/builtin-report.c +21 -15
@@ -583,6 +583,7 @@ struct sort_entry {int64_t (*collapse)(struct hist_entry *,struct hist_entry *);size_t (*print)(FILE *fp,struct hist_entry *,unsigned int width);unsigned int *width; +bool elide; };static int64_t cmp_null (void *l,void *r)
@@ -1024,7 +1025,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples) ret =fprintf (fp, field_sep ?"%lld" :"%12lld " , self->count);list_for_each_entry (se, &hist_entry__sort_list, list) { -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;fprintf (fp,"%s" , field_sep ?:" " );
@@ -1079,7 +1080,7 @@ resolve_symbol(struct thread *thread, struct map **mapp,* with no symbol hit that has a name longer than * the ones with symbols sampled. */ -if (!map->dso->slen_calculated) +if (!sort_dso.elide && !map->dso->slen_calculated)dso__calc_col_width (map->dso);if (mapp)
@@ -1356,14 +1357,12 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)unsigned int width;char *col_width = col_width_list_str; -fprintf (fp,"\n" ); -fprintf (fp,"#\n" ); -fprintf (fp,"# (%Ld samples)\n" , (u64 )total_samples); +fprintf (fp,"# Samples: %Ld\n" , (u64 )total_samples);fprintf (fp,"#\n" );fprintf (fp,"# Overhead" );list_for_each_entry (se, &hist_entry__sort_list, list) { -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;if (field_sep) {fprintf (fp,"%c%s" , *field_sep, se->header);
@@ -1392,7 +1391,7 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)list_for_each_entry (se, &hist_entry__sort_list, list) {unsigned int i; -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;fprintf (fp," " );
@@ -2022,7 +2021,8 @@ static void setup_sorting(void) }static void setup_list (struct strlist **list,const char *list_str, -const char *list_name) +struct sort_entry *se,const char *list_name, +FILE *fp) {if (list_str) { *list =strlist__new (true, list_str);
@@ -2031,6 +2031,11 @@ static void setup_list(struct strlist **list, const char *list_str, list_name);exit (129 ); } +if (strlist__nr_entries (*list) ==1 ) { +fprintf (fp,"# %s: %s\n" , list_name, +strlist__entry (*list,0 )->s); + se->elide = true; + } } }
@@ -2044,9 +2049,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)setup_sorting (); -if (parent_pattern != default_parent_pattern) +if (parent_pattern != default_parent_pattern) {sort_dimension__add ("parent" ); -else + sort_parent.elide =1 ; + }else exclude_other =0 ;/*
@@ -2055,9 +2061,11 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)if (argc)usage_with_options (report_usage, options); -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 (); + +setup_list (&dso_list, dso_list_str, &sort_dso,"dso" , stdout); +setup_list (&comm_list, comm_list_str, &sort_comm,"comm" , stdout); +setup_list (&sym_list, sym_list_str, &sort_sym,"symbol" , stdout);if (field_sep && *field_sep =='.' ) { fputs("'.' is the only non valid --field-separator argument\n",
@@ -2065,7 +2073,5 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)exit (129 ); } -setup_pager (); -return __cmd_report (); }
Signature · 1 line
1.6.2.5
PATCH 4/5 perf_counter tools: PLT info is stripped in -debuginfo packages
So we need to get the richer .symtab from the debuginfo packages but the PLT info from the original DSO where we have just the leaner .dynsym symtab.
Example:
[acme@doppio pahole]$ perf report --sort comm,dso,symbol > before [acme@doppio pahole]$ perf report --sort comm,dso,symbol > after [acme@doppio pahole]$ diff -U1 before after
after renamed from before +2 -1
@@ -80,3 +80,2 @@ 0.07% pahole ./build/pahole [.] pahole_stealer - 0.06% pahole /usr/lib64/libdw-0.141.so [.] 0x00000000007140 0.06% pahole /usr/lib64/libdw-0.141.so [.] __libdw_getabbrev
@@ -91,2 +90,3 @@ 0.06% pahole [kernel] [k] free_hot_cold_page + 0.06% pahole /usr/lib64/libdw-0.141.so [.] tfind@plt 0.05% pahole ./build/libdwarves.so.1.0.0 [.] ftype__add_parameter
@@ -242,2 +242,3 @@ 0.01% pahole [kernel] [k] account_group_user_time + 0.01% pahole /usr/lib64/libdw-0.141.so [.] strlen@plt 0.01% pahole ./build/pahole [.] strcmp@plt
[acme@doppio pahole]$
--- tools/perf/util/symbol.c | 116 ++++++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 51 deletions(-)
tools/perf/util/symbol.c +65 -51
193 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 5/5 perf report: Introduce -n/--show-nr-samples
[acme@doppio pahole]$ perf report -ns comm,dso,symbol -d /lib64/libc-2.10.1.so -C pahole | head -17
21.94% 32101 [.] _int_malloc
20.10% 29402 [.] __GI_strcmp
16.77% 24533 [.] __tsearch
12.61% 18450 [.] malloc_consolidate
6.42% 9394 [.] _int_free
6.28% 9191 [.] __tfind
4.56% 6678 [.] __GI___libc_free
4.46% 6520 [.] _IO_vfprintf_internal
2.59% 3786 [.] __malloc
1.17% 1716 [.] __GI_memcpy[acme@doppio pahole]$
--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/builtin-report.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -24,6 +24,9 @@ OPTIONS --dsos=:: Only consider symbols in these dsos. CSV that understands file://filename entries. +-n +--show-nr-samples + Show the number of samples for each symbol -C:: --comms=:: Only consider symbols in these comms. CSV that understands
tools/perf/builtin-report.c +18 -0
@@ -51,6 +51,7 @@ static int verbose;static int modules;static int full_paths; +static int show_nr_samples;static unsigned long page_size;static unsigned long mmap_window =32 ;
@@ -1024,6 +1025,13 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)else ret =fprintf (fp, field_sep ?"%lld" :"%12lld " , self->count); +if (show_nr_samples) { +if (field_sep) +fprintf (fp,"%c%lld" , *field_sep, self->count); +else +fprintf (fp,"%11lld" , self->count); + } +list_for_each_entry (se, &hist_entry__sort_list, list) {if (se->elide)continue ;
@@ -1361,6 +1369,12 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)fprintf (fp,"#\n" );fprintf (fp,"# Overhead" ); +if (show_nr_samples) { +if (field_sep) +fprintf (fp,"%cSamples" , *field_sep); +else +fputs (" Samples " , fp); + }list_for_each_entry (se, &hist_entry__sort_list, list) {if (se->elide)continue ;
@@ -1388,6 +1402,8 @@ static size_t output__fprintf(FILE *fp, u64 total_samples) goto print_entries;fprintf (fp,"# ........" ); +if (show_nr_samples) +fprintf (fp," .........." );list_for_each_entry (se, &hist_entry__sort_list, list) {unsigned int i;
@@ -1979,6 +1995,8 @@ static const struct option options[] = {OPT_STRING ('k' ,"vmlinux" , &vmlinux,"file" ,"vmlinux pathname" ),OPT_BOOLEAN ('m' ,"modules" , &modules,"load module symbols - WARNING: use only with -k and LIVE kernel" ), +OPT_BOOLEAN ('n' ,"show-nr-samples" , &show_nr_samples, +"Show a column with the number of samples" ),OPT_STRING ('s' ,"sort" , &sort_order,"key[,key2...]" ,"sort by key(s): pid, comm, dso, symbol, parent" ), OPT_BOOLEAN('P', "full-paths", &full_paths,
Signature · 1 line
1.6.2.5
[tip:perfcounters/core] perf report: Introduce -n/--show-nr-samples
Commit-ID: e3d7e183dc276df2fcaf02af173a49ad119ba9f9 Gitweb: http://git.kernel.org/tip/e3d7e183dc276df2fcaf02af173a49ad119ba9f9 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 11 Jul 2009 12:18:37 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 11 Jul 2009 19:20:27 +0200
perf report: Introduce -n/--show-nr-samples
[acme@doppio pahole]$ perf report -ns comm,dso,symbol -d /lib64/libc-2.10.1.so -C pahole | head -17
21.94% 32101 [.] _int_malloc
20.10% 29402 [.] __GI_strcmp
16.77% 24533 [.] __tsearch
12.61% 18450 [.] malloc_consolidate
6.42% 9394 [.] _int_free
6.28% 9191 [.] __tfind
4.56% 6678 [.] __GI___libc_free
4.46% 6520 [.] _IO_vfprintf_internal
2.59% 3786 [.] __malloc
1.17% 1716 [.] __GI_memcpy[acme@doppio pahole]$
LKML-Reference: <[email protected]>
--- tools/perf/Documentation/perf-report.txt | 3 +++ tools/perf/builtin-report.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
tools/perf/Documentation/perf-report.txt +3 -0
@@ -24,6 +24,9 @@ OPTIONS --dsos=:: Only consider symbols in these dsos. CSV that understands file://filename entries. +-n +--show-nr-samples + Show the number of samples for each symbol -C:: --comms=:: Only consider symbols in these comms. CSV that understands
tools/perf/builtin-report.c +18 -0
@@ -51,6 +51,7 @@ static int verbose;static int modules;static int full_paths; +static int show_nr_samples;static unsigned long page_size;static unsigned long mmap_window =32 ;
@@ -1024,6 +1025,13 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)else ret =fprintf (fp, field_sep ?"%lld" :"%12lld " , self->count); +if (show_nr_samples) { +if (field_sep) +fprintf (fp,"%c%lld" , *field_sep, self->count); +else +fprintf (fp,"%11lld" , self->count); + } +list_for_each_entry (se, &hist_entry__sort_list, list) {if (se->elide)continue ;
@@ -1361,6 +1369,12 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)fprintf (fp,"#\n" );fprintf (fp,"# Overhead" ); +if (show_nr_samples) { +if (field_sep) +fprintf (fp,"%cSamples" , *field_sep); +else +fputs (" Samples " , fp); + }list_for_each_entry (se, &hist_entry__sort_list, list) {if (se->elide)continue ;
@@ -1388,6 +1402,8 @@ static size_t output__fprintf(FILE *fp, u64 total_samples) goto print_entries;fprintf (fp,"# ........" ); +if (show_nr_samples) +fprintf (fp," .........." );list_for_each_entry (se, &hist_entry__sort_list, list) {unsigned int i;
@@ -1979,6 +1995,8 @@ static const struct option options[] = {OPT_STRING ('k' ,"vmlinux" , &vmlinux,"file" ,"vmlinux pathname" ),OPT_BOOLEAN ('m' ,"modules" , &modules,"load module symbols - WARNING: use only with -k and LIVE kernel" ), +OPT_BOOLEAN ('n' ,"show-nr-samples" , &show_nr_samples, +"Show a column with the number of samples" ),OPT_STRING ('s' ,"sort" , &sort_order,"key[,key2...]" ,"sort by key(s): pid, comm, dso, symbol, parent" ), OPT_BOOLEAN('P', "full-paths", &full_paths,
[tip:perfcounters/core] perf_counter tools: PLT info is stripped in -debuginfo packages
In reply to Arnaldo Carvalho de MeloCommit-ID: a25e46c46311316cd1b3f27f8bb036df1693c032 Gitweb: http://git.kernel.org/tip/a25e46c46311316cd1b3f27f8bb036df1693c032 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 11 Jul 2009 12:18:36 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 11 Jul 2009 19:20:26 +0200
perf_counter tools: PLT info is stripped in -debuginfo packages
So we need to get the richer .symtab from the debuginfo packages but the PLT info from the original DSO where we have just the leaner .dynsym symtab.
Example:
| [acme@doppio pahole]$ perf report --sort comm,dso,symbol > before | [acme@doppio pahole]$ perf report --sort comm,dso,symbol > after | [acme@doppio pahole]$ diff -U1 before after | --- before 2009-07-11 11:04:22.688595741 -0300 | +++ after 2009-07-11 11:04:33.380595676 -0300 | @@ -80,3 +80,2 @@ | 0.07% pahole ./build/pahole [.] pahole_stealer | - 0.06% pahole /usr/lib64/libdw-0.141.so [.] 0x00000000007140 | 0.06% pahole /usr/lib64/libdw-0.141.so [.] __libdw_getabbrev | @@ -91,2 +90,3 @@ | 0.06% pahole [kernel] [k] free_hot_cold_page | + 0.06% pahole /usr/lib64/libdw-0.141.so [.] tfind@plt | 0.05% pahole ./build/libdwarves.so.1.0.0 [.] ftype__add_parameter | @@ -242,2 +242,3 @@ | 0.01% pahole [kernel] [k] account_group_user_time | + 0.01% pahole /usr/lib64/libdw-0.141.so [.] strlen@plt | 0.01% pahole ./build/pahole [.] strcmp@plt | [acme@doppio pahole]$
LKML-Reference: <[email protected]>
--- tools/perf/util/symbol.c | 116 ++++++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 51 deletions(-)
tools/perf/util/symbol.c +65 -51
@@ -374,36 +374,61 @@ static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep, idx < nr_entries; \ ++idx, pos = gelf_getrela(reldata, idx, &pos_mem)) -static int dso__synthesize_plt_symbols (struct dso *self,Elf *elf, -GElf_Ehdr *ehdr,Elf_Scn *scn_dynsym, -GElf_Shdr *shdr_dynsym, -size_t dynsym_idx,int verbose) +/* +* We need to check if we have a .dynsym, so that we can handle the +* .plt, synthesizing its symbols, that aren't on the symtabs (be it +* .dynsym or .symtab). +* And always look at the original dso, not at debuginfo packages, that +* have the PLT data stripped out (shdr_rel_plt.sh_type == SHT_NOBITS). +*/ +static int dso__synthesize_plt_symbols (struct dso *self,int verbose) {uint32_t nr_rel_entries, idx;GElf_Sym sym;u64 plt_offset;GElf_Shdr shdr_plt;struct symbol *f; -GElf_Shdr shdr_rel_plt; +GElf_Shdr shdr_rel_plt, shdr_dynsym;Elf_Data *reldata, *syms, *symstrs; -Elf_Scn *scn_plt_rel, *scn_symstrs; +Elf_Scn *scn_plt_rel, *scn_symstrs, *scn_dynsym; +size_t dynsym_idx; +GElf_Ehdr ehdr;char sympltname[1024 ]; -int nr =0 , symidx; +Elf *elf; +int nr =0 , symidx, fd, err =0 ; + + fd =open (self->name,O_RDONLY ); +if (fd <0 ) + goto out; + + elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL ); +if (elf ==NULL ) + goto out_close; + +if (gelf_getehdr (elf, &ehdr) ==NULL ) + goto out_elf_end; + + scn_dynsym =elf_section_by_name (elf, &ehdr, &shdr_dynsym, +".dynsym" , &dynsym_idx); +if (scn_dynsym ==NULL ) + goto out_elf_end; - scn_plt_rel =elf_section_by_name (elf, ehdr, &shdr_rel_plt, + scn_plt_rel =elf_section_by_name (elf, &ehdr, &shdr_rel_plt,".rela.plt" ,NULL );if (scn_plt_rel ==NULL ) { - scn_plt_rel =elf_section_by_name (elf, ehdr, &shdr_rel_plt, + scn_plt_rel =elf_section_by_name (elf, &ehdr, &shdr_rel_plt,".rel.plt" ,NULL );if (scn_plt_rel ==NULL ) -return 0 ; + goto out_elf_end; } + err =-1 ; +if (shdr_rel_plt.sh_link != dynsym_idx) -return 0 ; + goto out_elf_end; -if (elf_section_by_name (elf, ehdr, &shdr_plt,".plt" ,NULL ) ==NULL ) -return 0 ; +if (elf_section_by_name (elf, &ehdr, &shdr_plt,".plt" ,NULL ) ==NULL ) + goto out_elf_end;/* * Fetch the relocation section to find the indexes to the GOT
@@ -411,19 +436,19 @@ static int dso__synthesize_plt_symbols(struct dso *self, Elf *elf,*/ reldata =elf_getdata (scn_plt_rel,NULL );if (reldata ==NULL ) -return -1 ; + goto out_elf_end; syms =elf_getdata (scn_dynsym,NULL );if (syms ==NULL ) -return -1 ; + goto out_elf_end; - scn_symstrs =elf_getscn (elf, shdr_dynsym->sh_link); + scn_symstrs =elf_getscn (elf, shdr_dynsym.sh_link);if (scn_symstrs ==NULL ) -return -1 ; + goto out_elf_end; symstrs =elf_getdata (scn_symstrs,NULL );if (symstrs ==NULL ) -return -1 ; + goto out_elf_end; nr_rel_entries = shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize; plt_offset = shdr_plt.sh_offset;
@@ -442,7 +467,7 @@ static int dso__synthesize_plt_symbols(struct dso *self, Elf *elf, f =symbol__new (plt_offset, shdr_plt.sh_entsize, sympltname, self->sym_priv_size,0 , verbose);if (!f) -return -1 ; + goto out_elf_end;dso__insert_symbol (self, f); ++nr;
@@ -460,19 +485,25 @@ static int dso__synthesize_plt_symbols(struct dso *self, Elf *elf, f =symbol__new (plt_offset, shdr_plt.sh_entsize, sympltname, self->sym_priv_size,0 , verbose);if (!f) -return -1 ; + goto out_elf_end;dso__insert_symbol (self, f); ++nr; } - }else { -/* -* TODO: There are still one more shdr_rel_plt.sh_type -* I have to investigate, but probably should be ignored. -*/ } -return nr; + err =0 ; +out_elf_end: +elf_end (elf); +out_close: +close (fd); + +if (err ==0 ) +return nr; +out: +fprintf (stderr,"%s: problems reading %s PLT info.\n" , + __func__, self->name); +return 0 ; } static int dso__load_sym(struct dso *self, int fd, const char *name,
@@ -486,9 +517,8 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,GElf_Shdr shdr;Elf_Data *syms;GElf_Sym sym; -Elf_Scn *sec, *sec_dynsym, *sec_strndx; +Elf_Scn *sec, *sec_strndx;Elf *elf; -size_t dynsym_idx;int nr =0 ; elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL );
@@ -505,32 +535,11 @@ static int dso__load_sym(struct dso *self, int fd, const char *name, goto out_elf_end; } -/* -* We need to check if we have a .dynsym, so that we can handle the -* .plt, synthesizing its symbols, that aren't on the symtabs (be it -* .dynsym or .symtab) -*/ - sec_dynsym =elf_section_by_name (elf, &ehdr, &shdr, -".dynsym" , &dynsym_idx); -if (sec_dynsym !=NULL ) { - nr =dso__synthesize_plt_symbols (self, elf, &ehdr, - sec_dynsym, &shdr, - dynsym_idx, verbose); -if (nr <0 ) - goto out_elf_end; - } - -/* -* But if we have a full .symtab (that is a superset of .dynsym) we -* should add the symbols not in the .dynsyn -*/ sec =elf_section_by_name (elf, &ehdr, &shdr,".symtab" ,NULL );if (sec ==NULL ) { -if (sec_dynsym ==NULL ) + sec =elf_section_by_name (elf, &ehdr, &shdr,".dynsym" ,NULL ); +if (sec ==NULL ) goto out_elf_end; - - sec = sec_dynsym; -gelf_getshdr (sec, &shdr); } syms =elf_getdata (sec,NULL );
@@ -669,6 +678,11 @@ more:if (!ret) goto more; +if (ret >0 ) { +int nr_plt =dso__synthesize_plt_symbols (self, verbose); +if (nr_plt >0 ) + ret += nr_plt; + } out:free (name);return ret;
Re: [PATCH tip 3/5] perf report: Make the output more compact
In reply to Arnaldo Carvalho de MeloEm Sat, Jul 11, 2009 at 12:18:35PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
When we filter by column content we may end up with a column that has the same value for all the lines. So remove that column and tell its unique value on the top, as a comment.
Example:
Grr, it should have been:
Quoted 1 line
[acme@doppio pahole]$ perf report --sort comm,dso,symbol -d ./build/libdwarves.so.1.0.0 -C pahole | head -15
# dso: ./build/libdwarves.so.1.0.0
# comm: pahole
# Samples: 58409
#
# Overhead Symbol
# ........ ...... #
Quoted 9 lines
20.93% [.] tag__recode_dwarf_type 14.94% [.] namespace__recode_dwarf_types 10.38% [.] cu__table_add_tag 6.69% [.] __die__process_tag 5.05% [.] die__process_function 4.70% [.] list__for_all_tags 3.68% [.] tag__init 3.48% [.] die__create_new_parameter[acme@doppio pahole]$
Forgot to add a space before the hashes...
- Arnaldo
[tip:perfcounters/core] perf report: Make the output more compact
In reply to Arnaldo Carvalho de MeloCommit-ID: 021191b35cdfb1b5ee6e78ed5ae010114a40902c Gitweb: http://git.kernel.org/tip/021191b35cdfb1b5ee6e78ed5ae010114a40902c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 11 Jul 2009 12:18:35 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 11 Jul 2009 19:20:26 +0200
perf report: Make the output more compact
When we filter by column content we may end up with a column that has the same value for all the lines. So remove that column and tell its unique value on the top, as a comment.
Example:
[acme@doppio pahole]$ perf report --sort comm,dso,symbol -d ./build/libdwarves.so.1.0.0 -C pahole | head -15
# dso: ./build/libdwarves.so.1.0.0
# comm: pahole
# Samples: 58409
#
# Overhead Symbol
# ........ ......
#
20.93% [.] tag__recode_dwarf_type
14.94% [.] namespace__recode_dwarf_types
10.38% [.] cu__table_add_tag
6.69% [.] __die__process_tag
5.05% [.] die__process_function
4.70% [.] list__for_all_tags
3.68% [.] tag__init
3.48% [.] die__create_new_parameter
[acme@doppio pahole]$LKML-Reference: <[email protected]>
--- tools/perf/builtin-report.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)
tools/perf/builtin-report.c +21 -15
@@ -583,6 +583,7 @@ struct sort_entry {int64_t (*collapse)(struct hist_entry *,struct hist_entry *);size_t (*print)(FILE *fp,struct hist_entry *,unsigned int width);unsigned int *width; +bool elide; };static int64_t cmp_null (void *l,void *r)
@@ -1024,7 +1025,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples) ret =fprintf (fp, field_sep ?"%lld" :"%12lld " , self->count);list_for_each_entry (se, &hist_entry__sort_list, list) { -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;fprintf (fp,"%s" , field_sep ?:" " );
@@ -1079,7 +1080,7 @@ resolve_symbol(struct thread *thread, struct map **mapp,* with no symbol hit that has a name longer than * the ones with symbols sampled. */ -if (!map->dso->slen_calculated) +if (!sort_dso.elide && !map->dso->slen_calculated)dso__calc_col_width (map->dso);if (mapp)
@@ -1356,14 +1357,12 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)unsigned int width;char *col_width = col_width_list_str; -fprintf (fp,"\n" ); -fprintf (fp,"#\n" ); -fprintf (fp,"# (%Ld samples)\n" , (u64 )total_samples); +fprintf (fp,"# Samples: %Ld\n" , (u64 )total_samples);fprintf (fp,"#\n" );fprintf (fp,"# Overhead" );list_for_each_entry (se, &hist_entry__sort_list, list) { -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;if (field_sep) {fprintf (fp,"%c%s" , *field_sep, se->header);
@@ -1392,7 +1391,7 @@ static size_t output__fprintf(FILE *fp, u64 total_samples)list_for_each_entry (se, &hist_entry__sort_list, list) {unsigned int i; -if (exclude_other && (se == &sort_parent)) +if (se->elide)continue ;fprintf (fp," " );
@@ -2022,7 +2021,8 @@ static void setup_sorting(void) }static void setup_list (struct strlist **list,const char *list_str, -const char *list_name) +struct sort_entry *se,const char *list_name, +FILE *fp) {if (list_str) { *list =strlist__new (true, list_str);
@@ -2031,6 +2031,11 @@ static void setup_list(struct strlist **list, const char *list_str, list_name);exit (129 ); } +if (strlist__nr_entries (*list) ==1 ) { +fprintf (fp,"# %s: %s\n" , list_name, +strlist__entry (*list,0 )->s); + se->elide = true; + } } }
@@ -2044,9 +2049,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)setup_sorting (); -if (parent_pattern != default_parent_pattern) +if (parent_pattern != default_parent_pattern) {sort_dimension__add ("parent" ); -else + sort_parent.elide =1 ; + }else exclude_other =0 ;/*
@@ -2055,9 +2061,11 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)if (argc)usage_with_options (report_usage, options); -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 (); + +setup_list (&dso_list, dso_list_str, &sort_dso,"dso" , stdout); +setup_list (&comm_list, comm_list_str, &sort_comm,"comm" , stdout); +setup_list (&sym_list, sym_list_str, &sort_sym,"symbol" , stdout);if (field_sep && *field_sep =='.' ) { fputs("'.' is the only non valid --field-separator argument\n",
@@ -2065,7 +2073,5 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)exit (129 ); } -setup_pager (); -return __cmd_report (); }
[tip:perfcounters/core] strlist: Introduce strlist__entry and strlist__nr_entries methods
In reply to Arnaldo Carvalho de MeloCommit-ID: 27d0fd410c3cee00ece2e55f4354a7a9ec1a6a6a Gitweb: http://git.kernel.org/tip/27d0fd410c3cee00ece2e55f4354a7a9ec1a6a6a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 11 Jul 2009 12:18:34 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 11 Jul 2009 19:20:25 +0200
strlist: Introduce strlist__entry and strlist__nr_entries methods
The strlist__entry method allows accessing strlists like an array, will be used in the 'perf report' to access the first entry.
We now keep the nr_entries so that we can check if we have just one entry, will be used in 'perf report' to improve the output by showing just at the top when we have just, say, one DSO.
While at it use nr_entries to optimize strlist__is_empty by not using the far more costly rb_first based implementation.
LKML-Reference: <[email protected]>
--- tools/perf/util/strlist.c | 20 ++++++++++++++++++-- tools/perf/util/strlist.h | 11 +++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-)
tools/perf/util/strlist.c +18 -2
@@ -64,6 +64,7 @@ int strlist__add(struct strlist *self, const char *new_entry)rb_link_node (&sn->rb_node, parent, p);rb_insert_color (&sn->rb_node, &self->entries); + ++self->nr_entries;return 0 ; }
@@ -155,8 +156,9 @@ struct strlist *strlist__new(bool dupstr, const char *slist)struct strlist *self =malloc (sizeof (*self));if (self !=NULL ) { - self->entries =RB_ROOT ; - self->dupstr = dupstr; + self->entries =RB_ROOT ; + self->dupstr = dupstr; + self->nr_entries =0 ;if (slist &&strlist__parse_list (self, slist) !=0 ) goto out_error; }
@@ -182,3 +184,17 @@ void strlist__delete(struct strlist *self)free (self); } } + +struct str_node *strlist__entry (const struct strlist *self,unsigned int idx) +{ +struct rb_node *nd; + +for (nd =rb_first (&self->entries); nd; nd =rb_next (nd)) { + struct str_node *pos = rb_entry(nd, struct str_node, rb_node); + +if (!idx--) +return pos; + } + +return NULL ; +}
tools/perf/util/strlist.h +9 -2
@@ -11,7 +11,8 @@ struct str_node {struct strlist {struct rb_root entries; -bool dupstr; +unsigned int nr_entries; +bool dupstr; };struct strlist *strlist__new (bool dupstr,const char *slist);
@@ -21,11 +22,17 @@ 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); +struct str_node *strlist__entry (const struct strlist *self,unsigned int idx);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 ; +return self->nr_entries ==0 ; +} + +static inline unsigned int strlist__nr_entries (const struct strlist *self) +{ +return self->nr_entries; }int strlist__parse_list (struct strlist *self,const char *s);
Commit-ID: 60c1baf1248e00d423604f018c8af1cf750ad885 Gitweb: http://git.kernel.org/tip/60c1baf1248e00d423604f018c8af1cf750ad885 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 11 Jul 2009 12:18:33 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 11 Jul 2009 19:20:25 +0200
perf report: Tidy up reporting of symbols not found
Always printing the level info about if it is in the kernel, hypervisor or userspace as that is in the hist_entry.
LKML-Reference: <[email protected]>
--- tools/perf/builtin-report.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +2 -3
@@ -705,10 +705,9 @@ sort__sym_print(FILE *fp, struct hist_entry *self, unsigned int width __used)if (verbose) ret +=repsep_fprintf (fp,"%#018llx " , (u64 )self->ip); + ret +=repsep_fprintf (fp,"[%c] " , self->level);if (self->sym) { - ret +=repsep_fprintf (fp,"[%c] %s" , - self->dso == kernel_dso ?'k' : - self->dso == hypervisor_dso ?'h' :'.' , self->sym->name); + ret +=repsep_fprintf (fp,"%s" , self->sym->name);if (self->sym->module) ret += repsep_fprintf(fp, "\t[%s]",