perf tools: Check availability of annotate when processing samples
Namhyung Kim
maintainerPATCH 1/4 perf tools: Check availability of annotate when processing samples
The TUI of perf report and top support annotation, but stdio and GTK don't. So it should be checked before calling hist_entry__inc_addr_ samples() since perf annotate need it regardless of UI and sort keys.
It caused perf annotate on ppc64 to produce zero output.
--- tools/perf/builtin-report.c | 45 +++++++++++++++++++++++++++++---------------- tools/perf/builtin-top.c | 11 +++++++++-- tools/perf/util/annotate.c | 2 +- 3 files changed, 39 insertions(+), 19 deletions(-)
tools/perf/builtin-report.c +29 -16
@@ -75,6 +75,11 @@ static int report__config(const char *var, const char *value, void *cb)return perf_default_config (var, value, cb); } +static bool report_needs_annotate (void ) +{ +return use_browser ==1 && sort__has_sym; +} +static int report__add_mem_hist_entry (struct report *rep,struct addr_location *al,struct perf_sample *sample,struct perf_evsel *evsel) {
@@ -110,14 +115,16 @@ static int report__add_mem_hist_entry(struct report *rep, struct addr_location *if (!he)return -ENOMEM ; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); -if (err) - goto out; +if (report_needs_annotate ()) { + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (err) + goto out; - mx = he->mem_info; - err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); -if (err) - goto out; + mx = he->mem_info; + err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -159,14 +166,18 @@ static int report__add_branch_hist_entry(struct report *rep, struct addr_locatio he =__hists__add_entry (&evsel->hists, al, parent, &bi[i],NULL ,1 ,1 ,0 );if (he) { - bx = he->branch_info; - err =addr_map_symbol__inc_samples (&bx->from, evsel->idx); -if (err) - goto out; - - err =addr_map_symbol__inc_samples (&bx->to, evsel->idx); -if (err) - goto out; +if (report_needs_annotate ()) { + bx = he->branch_info; + err =addr_map_symbol__inc_samples (&bx->from, + evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bx->to, + evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -199,7 +210,9 @@ static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel,if (err) goto out; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (report_needs_annotate ()) + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); + evsel->hists.stats.total_period += sample->period;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:
tools/perf/builtin-top.c +9 -2
@@ -87,6 +87,11 @@ static void perf_top__sig_winch(int sig __maybe_unused,perf_top__update_print_entries (top); } +static bool top_needs_annotate (void ) +{ +return use_browser ==1 && sort__has_sym; +} +static int perf_top__parse_source (struct perf_top *top,struct hist_entry *he) {struct symbol *sym;
@@ -176,7 +181,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, {struct annotation *notes;struct symbol *sym; -int err; +int err =0 ; if (he == NULL || he->ms.sym == NULL || ((top->sym_filter_entry == NULL ||
@@ -190,7 +195,9 @@ static void perf_top__record_precise_ip(struct perf_top *top,return ; ip = he->ms.map->map_ip (he->ms.map, ip); - err =hist_entry__inc_addr_samples (he, counter, ip); + +if (top_needs_annotate ()) + err =hist_entry__inc_addr_samples (he, counter, ip);pthread_mutex_unlock (¬es->lock);
tools/perf/util/annotate.c +1 -1
@@ -489,7 +489,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, {struct annotation *notes; -if (sym ==NULL || use_browser !=1 || !sort__has_sym) +if (sym ==NULL )return 0 ; notes =symbol__annotation (sym);
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 2/4 perf tools: Destroy unused symsrcs
Stephane reported that perf report and annotate failed to process data using lots of (> 500) shared libraries. It was because of the limit on number of open files (ulimit -n).
Currently when perf loads dso, it'll look for normal and dynamic symbol tables. And if it failed to find out both tables, it'll iterate all of possible symtab types. But many of them are useless since they have no additional information and the problem is that it's not close those files even though they're not used. Fix it.
--- tools/perf/util/symbol.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/symbol.c +2 -0
@@ -1336,6 +1336,8 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (syms_ss && runtime_ss)break ; + }else { +symsrc__destroy (ss); } }
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/urgent] perf symbols: Destroy unused symsrcs
perf symbols: Destroy unused symsrcs
Commit-ID: 98e9f03bbf2cb21a60f94b8b700eb5d38470819d Gitweb: http://git.kernel.org/tip/98e9f03bbf2cb21a60f94b8b700eb5d38470819d Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 20 Feb 2014 10:32:54 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 24 Feb 2014 11:13:08 -0300
perf symbols: Destroy unused symsrcs
Stephane reported that perf report and annotate failed to process data using lots of (> 500) shared libraries. It was because of the limit on number of open files (ulimit -n).
Currently when perf loads a DSO, it'll look for normal and dynamic symbol tables. And if it fails to find out both tables, it'll iterate all of possible symtab types. But many of them are useless since they have no additional information and the problem is that it's not closing those files even though they're not used. Fix it.
--- tools/perf/util/symbol.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/symbol.c +2 -0
@@ -1336,6 +1336,8 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (syms_ss && runtime_ss)break ; + }else { +symsrc__destroy (ss); } }
Namhyung Kim
maintainerPATCH 3/4 perf tools: Check return value of filename__read_debuglink()
In reply to Namhyung KimFrom: Stephane Eranian <[email protected]>
When dso__read_binary_type_filename() called, it doesn't check the return value of filename__read_debuglink() so that it'll try to open the debuglink file even if it doesn't exist.
Also fix return value of the filename__read_debuglink() as it always return -1 regardless of the result.
---
Stephane, can I add your s-o-b here?
tools/perf/util/dso.c | 4 ++-- tools/perf/util/symbol-elf.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/dso.c +2 -2
@@ -45,8 +45,8 @@ int dso__read_binary_type_filename(const struct dso *dso, debuglink--;if (*debuglink =='/' ) debuglink++; -filename__read_debuglink (dso->long_name, debuglink, - size - (debuglink - filename)); + ret =filename__read_debuglink (dso->long_name, debuglink, + size - (debuglink - filename)); }break ;case DSO_BINARY_TYPE__BUILD_ID_CACHE :
tools/perf/util/symbol-elf.c +2 -0
@@ -506,6 +506,8 @@ int filename__read_debuglink(const char *filename, char *debuglink,/* the start of this section is a zero-terminated string */ strncpy (debuglink, data->d_buf, size); + err =0 ; + out_elf_end:elf_end (elf); out_close:
Signature · 1 line
1.7.11.7
tip-bot for Stephane Eranian
merge bot[tip:perf/core] perf symbols: Check return value of filename__read_debuglink()
perf symbols: Check return value of filename__read_debuglink()
Commit-ID: 0d3dc5e8b85a144aaeb5dc26f7f2113e4c4e7e81 Gitweb: http://git.kernel.org/tip/0d3dc5e8b85a144aaeb5dc26f7f2113e4c4e7e81 Author: Stephane Eranian <[email protected]> AuthorDate: Thu, 20 Feb 2014 10:32:55 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 24 Feb 2014 16:24:38 -0300
perf symbols: Check return value of filename__read_debuglink()
When dso__read_binary_type_filename() called, it doesn't check the return value of filename__read_debuglink() so that it'll try to open the debuglink file even if it doesn't exist.
Also fix return value of the filename__read_debuglink() as it always return -1 regardless of the result.
--- tools/perf/util/dso.c | 4 ++-- tools/perf/util/symbol-elf.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/dso.c +2 -2
@@ -45,8 +45,8 @@ int dso__read_binary_type_filename(const struct dso *dso, debuglink--;if (*debuglink =='/' ) debuglink++; -filename__read_debuglink (dso->long_name, debuglink, - size - (debuglink - filename)); + ret =filename__read_debuglink (dso->long_name, debuglink, + size - (debuglink - filename)); }break ;case DSO_BINARY_TYPE__BUILD_ID_CACHE :
tools/perf/util/symbol-elf.c +2 -0
@@ -506,6 +506,8 @@ int filename__read_debuglink(const char *filename, char *debuglink,/* the start of this section is a zero-terminated string */ strncpy (debuglink, data->d_buf, size); + err =0 ; + out_elf_end:elf_end (elf); out_close:
Namhyung Kim
maintainerPATCH 4/4 perf tools: Check compatible symtab type before loading dso
In reply to Namhyung KimWhen loading a dso it'll look for symbol tables of all possible types. However it's just wasted of time to check incompatible types - like trying kernel module when loading user library.
--- tools/perf/util/symbol.c | 61 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 9 deletions(-)
tools/perf/util/symbol.c +52 -9
@@ -1251,6 +1251,46 @@ out_failure:return -1 ; } +static bool dso__is_compatible_symtab_type (struct dso *dso,bool kmod, +enum dso_binary_type type) +{ +switch (type) { +case DSO_BINARY_TYPE__JAVA_JIT : +case DSO_BINARY_TYPE__DEBUGLINK : +case DSO_BINARY_TYPE__SYSTEM_PATH_DSO : +case DSO_BINARY_TYPE__FEDORA_DEBUGINFO : +case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO : +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO : +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : +return !kmod && dso->kernel ==DSO_TYPE_USER ; + +case DSO_BINARY_TYPE__KALLSYMS : +case DSO_BINARY_TYPE__VMLINUX : +case DSO_BINARY_TYPE__KCORE : +return dso->kernel ==DSO_TYPE_KERNEL ; + +case DSO_BINARY_TYPE__GUEST_KALLSYMS : +case DSO_BINARY_TYPE__GUEST_VMLINUX : +case DSO_BINARY_TYPE__GUEST_KCORE : +return dso->kernel ==DSO_TYPE_GUEST_KERNEL ; + +case DSO_BINARY_TYPE__GUEST_KMODULE : +case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE : +/* +* kernel modules know their symtab type - it's set when +* creating a module dso in machine__new_module(). +*/ +return kmod && dso->symtab_type == type; + +case DSO_BINARY_TYPE__BUILD_ID_CACHE : +return true; + +case DSO_BINARY_TYPE__NOT_FOUND : +default : +return false; + } +} +int dso__load (struct dso *dso,struct map *map,symbol_filter_t filter) {char *name;
@@ -1261,6 +1301,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)int ss_pos =0 ;struct symsrc ss_[2 ];struct symsrc *syms_ss =NULL , *runtime_ss =NULL ; +bool kmod;dso__set_loaded (dso, map->type);
@@ -1301,7 +1342,11 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (!name)return -1 ; -/* Iterate over candidate debug images. + kmod = dso->symtab_type ==DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE || + dso->symtab_type ==DSO_BINARY_TYPE__GUEST_KMODULE ; + +/* +* Iterate over candidate debug images. * Keep track of "interesting" ones (those which have a symtab, dynsym, * and/or opd section) for processing. */
@@ -1311,6 +1356,9 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)enum dso_binary_type symtab_type = binary_type_symtab[i]; +if (!dso__is_compatible_symtab_type (dso, kmod, symtab_type)) +continue ; +if (dso__read_binary_type_filename (dso, symtab_type, root_dir, name,PATH_MAX ))continue ;
@@ -1353,15 +1401,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (!runtime_ss && syms_ss) runtime_ss = syms_ss; -if (syms_ss) { -int km; - - km = dso->symtab_type ==DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE || - dso->symtab_type ==DSO_BINARY_TYPE__GUEST_KMODULE ; - ret =dso__load_sym (dso, map, syms_ss, runtime_ss, filter, km); - }else { +if (syms_ss) + ret =dso__load_sym (dso, map, syms_ss, runtime_ss, filter, kmod); +else ret =-1 ; - }if (ret >0 ) {int nr_plt;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf symbols: Check compatible symtab type before loading dso
perf symbols: Check compatible symtab type before loading dso
Commit-ID: 1029f9fedf87fa6f52096991588fa54ffd159584 Gitweb: http://git.kernel.org/tip/1029f9fedf87fa6f52096991588fa54ffd159584 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 20 Feb 2014 10:32:56 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 24 Feb 2014 16:25:01 -0300
perf symbols: Check compatible symtab type before loading dso
When loading a dso it'll look for symbol tables of all possible types. However it's just wasted of time to check incompatible types - like trying kernel module when loading user library.
--- tools/perf/util/symbol.c | 61 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 9 deletions(-)
tools/perf/util/symbol.c +52 -9
@@ -1251,6 +1251,46 @@ out_failure:return -1 ; } +static bool dso__is_compatible_symtab_type (struct dso *dso,bool kmod, +enum dso_binary_type type) +{ +switch (type) { +case DSO_BINARY_TYPE__JAVA_JIT : +case DSO_BINARY_TYPE__DEBUGLINK : +case DSO_BINARY_TYPE__SYSTEM_PATH_DSO : +case DSO_BINARY_TYPE__FEDORA_DEBUGINFO : +case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO : +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO : +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : +return !kmod && dso->kernel ==DSO_TYPE_USER ; + +case DSO_BINARY_TYPE__KALLSYMS : +case DSO_BINARY_TYPE__VMLINUX : +case DSO_BINARY_TYPE__KCORE : +return dso->kernel ==DSO_TYPE_KERNEL ; + +case DSO_BINARY_TYPE__GUEST_KALLSYMS : +case DSO_BINARY_TYPE__GUEST_VMLINUX : +case DSO_BINARY_TYPE__GUEST_KCORE : +return dso->kernel ==DSO_TYPE_GUEST_KERNEL ; + +case DSO_BINARY_TYPE__GUEST_KMODULE : +case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE : +/* +* kernel modules know their symtab type - it's set when +* creating a module dso in machine__new_module(). +*/ +return kmod && dso->symtab_type == type; + +case DSO_BINARY_TYPE__BUILD_ID_CACHE : +return true; + +case DSO_BINARY_TYPE__NOT_FOUND : +default : +return false; + } +} +int dso__load (struct dso *dso,struct map *map,symbol_filter_t filter) {char *name;
@@ -1261,6 +1301,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)int ss_pos =0 ;struct symsrc ss_[2 ];struct symsrc *syms_ss =NULL , *runtime_ss =NULL ; +bool kmod;dso__set_loaded (dso, map->type);
@@ -1301,7 +1342,11 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (!name)return -1 ; -/* Iterate over candidate debug images. + kmod = dso->symtab_type ==DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE || + dso->symtab_type ==DSO_BINARY_TYPE__GUEST_KMODULE ; + +/* +* Iterate over candidate debug images. * Keep track of "interesting" ones (those which have a symtab, dynsym, * and/or opd section) for processing. */
@@ -1311,6 +1356,9 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)enum dso_binary_type symtab_type = binary_type_symtab[i]; +if (!dso__is_compatible_symtab_type (dso, kmod, symtab_type)) +continue ; +if (dso__read_binary_type_filename (dso, symtab_type, root_dir, name,PATH_MAX ))continue ;
@@ -1351,15 +1399,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (!runtime_ss && syms_ss) runtime_ss = syms_ss; -if (syms_ss) { -int km; - - km = dso->symtab_type ==DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE || - dso->symtab_type ==DSO_BINARY_TYPE__GUEST_KMODULE ; - ret =dso__load_sym (dso, map, syms_ss, runtime_ss, filter, km); - }else { +if (syms_ss) + ret =dso__load_sym (dso, map, syms_ss, runtime_ss, filter, kmod); +else ret =-1 ; - }if (ret >0 ) {int nr_plt;
Em Thu, Feb 20, 2014 at 10:32:53AM +0900, Namhyung Kim escreveu:
Quoted 5 lines
The TUI of perf report and top support annotation, but stdio and GTK don't. So it should be checked before calling
hist_entry__inc_addr_samples()since perf annotate need it regardless of UI and sort keys.It caused perf annotate on ppc64 to produce zero output.
I renamed {top,report}_needs_annotate to ui__has_annotation() and will make this patch apply on perf/urgent, as it is a bug fix.
While looking at it I noticed several things that can be improved in this area, like we don't need to map the ip in top if we're not going to use it, etc. But will leave those to a follow on patch.
Thanks,
- Arnaldo
Quoted 138 lines
Reported-by Anton Blanchard <[email protected]>Cc Anton Blanchard <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/builtin-report.c | 45 +++++++++++++++++++++++++++++---------------- tools/perf/builtin-top.c | 11 +++++++++-- tools/perf/util/annotate.c | 2 +- 3 files changed, 39 insertions(+), 19 deletions(-)tools/perf/builtin-report.c +29
-16@@ -75,6 +75,11 @@ static int report__config(const char *var, const char *value, void *cb)return perf_default_config (var, value, cb); } +static bool report_needs_annotate (void ) +{ +return use_browser ==1 && sort__has_sym; +} +static int report__add_mem_hist_entry (struct report *rep,struct addr_location *al,struct perf_sample *sample,struct perf_evsel *evsel) {@@ -110,14 +115,16 @@ static int report__add_mem_hist_entry(struct report *rep, struct addr_location *if (!he)return -ENOMEM ; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); -if (err) - goto out; +if (report_needs_annotate ()) { + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (err) + goto out; - mx = he->mem_info; - err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); -if (err) - goto out; + mx = he->mem_info; + err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );@@ -159,14 +166,18 @@ static int report__add_branch_hist_entry(struct report *rep, struct addr_locatio he =__hists__add_entry (&evsel->hists, al, parent, &bi[i],NULL ,1 ,1 ,0 );if (he) { - bx = he->branch_info; - err =addr_map_symbol__inc_samples (&bx->from, evsel->idx); -if (err) - goto out; - - err =addr_map_symbol__inc_samples (&bx->to, evsel->idx); -if (err) - goto out; +if (report_needs_annotate ()) { + bx = he->branch_info; + err =addr_map_symbol__inc_samples (&bx->from, + evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bx->to, + evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );@@ -199,7 +210,9 @@ static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel,if (err) goto out; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (report_needs_annotate ()) + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); + evsel->hists.stats.total_period += sample->period;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:tools/perf/builtin-top.c +9
-2@@ -87,6 +87,11 @@ static void perf_top__sig_winch(int sig __maybe_unused,perf_top__update_print_entries (top); } +static bool top_needs_annotate (void ) +{ +return use_browser ==1 && sort__has_sym; +} +static int perf_top__parse_source (struct perf_top *top,struct hist_entry *he) {struct symbol *sym;@@ -176,7 +181,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, {struct annotation *notes;struct symbol *sym; -int err; +int err =0 ; if (he == NULL || he->ms.sym == NULL || ((top->sym_filter_entry == NULL ||@@ -190,7 +195,9 @@ static void perf_top__record_precise_ip(struct perf_top *top,return ; ip = he->ms.map->map_ip (he->ms.map, ip); - err =hist_entry__inc_addr_samples (he, counter, ip); + +if (top_needs_annotate ()) + err =hist_entry__inc_addr_samples (he, counter, ip);pthread_mutex_unlock (¬es->lock);tools/perf/util/annotate.c +1
-1@@ -489,7 +489,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, {struct annotation *notes; -if (sym ==NULL || use_browser !=1 || !sort__has_sym) +if (sym ==NULL )return 0 ; notes =symbol__annotation (sym);Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/urgent] perf annotate: Check availability of annotate when processing samples
In reply to Namhyung Kimperf annotate: Check availability of annotate when processing samples
Commit-ID: 48c65bda95d692076de7e5eae3188ddae8635dca Gitweb: http://git.kernel.org/tip/48c65bda95d692076de7e5eae3188ddae8635dca Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 20 Feb 2014 10:32:53 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 24 Feb 2014 11:12:55 -0300
perf annotate: Check availability of annotate when processing samples
The TUI of perf report and top support annotation, but stdio and GTK don't. So it should be checked before calling hist_entry__inc_addr_ samples() to avoid wasting resources that will never be used.
perf annotate need it regardless of UI and sort keys, so the check of whether to allocate resources should be on the tools that have annotate as an option in the TUI, 'report' and 'top', not on the function called by all of them.
It caused perf annotate on ppc64 to produce zero output, since the buckets were not being allocated.
--- tools/perf/builtin-report.c | 40 ++++++++++++++++++++++++---------------- tools/perf/builtin-top.c | 6 ++++-- tools/perf/util/annotate.c | 9 ++++++++- tools/perf/util/annotate.h | 2 ++ 4 files changed, 38 insertions(+), 19 deletions(-)
tools/perf/builtin-report.c +24 -16
@@ -113,14 +113,16 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locatiif (!he)return -ENOMEM ; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); -if (err) - goto out; +if (ui__has_annotation ()) { + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (err) + goto out; - mx = he->mem_info; - err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); -if (err) - goto out; + mx = he->mem_info; + err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -164,14 +166,18 @@ static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_loc he =__hists__add_entry (&evsel->hists, al, parent, &bi[i],NULL ,1 ,1 ,0 );if (he) { - bx = he->branch_info; - err =addr_map_symbol__inc_samples (&bx->from, evsel->idx); -if (err) - goto out; - - err =addr_map_symbol__inc_samples (&bx->to, evsel->idx); -if (err) - goto out; +if (ui__has_annotation ()) { + bx = he->branch_info; + err =addr_map_symbol__inc_samples (&bx->from, + evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bx->to, + evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -205,7 +211,9 @@ static int report__add_hist_entry(struct perf_tool *tool, struct perf_evsel *evsif (err) goto out; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (ui__has_annotation ()) + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); + evsel->hists.stats.total_period += sample->period;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:
tools/perf/builtin-top.c +4 -2
@@ -176,7 +176,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, {struct annotation *notes;struct symbol *sym; -int err; +int err =0 ; if (he == NULL || he->ms.sym == NULL || ((top->sym_filter_entry == NULL ||
@@ -190,7 +190,9 @@ static void perf_top__record_precise_ip(struct perf_top *top,return ; ip = he->ms.map->map_ip (he->ms.map, ip); - err =hist_entry__inc_addr_samples (he, counter, ip); + +if (ui__has_annotation ()) + err =hist_entry__inc_addr_samples (he, counter, ip);pthread_mutex_unlock (¬es->lock);
tools/perf/util/annotate.c +8 -1
@@ -8,6 +8,8 @@*/ #include "util.h" +#include "ui/ui.h" +#include "sort.h" #include "build-id.h" #include "color.h" #include "cache.h"
@@ -489,7 +491,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, {struct annotation *notes; -if (sym ==NULL || use_browser !=1 || !sort__has_sym) +if (sym ==NULL )return 0 ; notes =symbol__annotation (sym);
@@ -1399,3 +1401,8 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) {return symbol__annotate (he->ms.sym, he->ms.map, privsize); } + +bool ui__has_annotation (void ) +{ +return use_browser ==1 && sort__has_sym; +}
tools/perf/util/annotate.h +2 -0
@@ -151,6 +151,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);void symbol__annotate_decay_histogram (struct symbol *sym,int evidx);void disasm__purge (struct list_head *head); +bool ui__has_annotation (void ); +int symbol__tty_annotate (struct symbol *sym,struct map *map,struct perf_evsel *evsel,bool print_lines,bool full_paths,int min_pcnt,int max_lines);