perf addr2line: Rework disable_add2line_warn
Subsystems (2)
cover perf addr2line: Rework disable_add2line_warn
Introduce configurable addr2line_disable_warn entry in the .perfconfig file. Clean up addr2line configuration.
Patch 1:
Rename disable_add2line_warn to addr2line_disable_warn (with 'r') and start name with prefix addr2line_ to make it consistent with other addr2line_xxx configuration parameters.
Patch 2:
Enable symbol_conf::addr2line_disable_warn set via config file.
Patch 3:
Remove global variable addr2line_timeout_ms and make it a member of struct::symbol_conf.
Thomas Richter (3):
perf config: Rename symbol_conf::disable_add2line_warn perf config: Make symbol_conf::addr2line_disable_warn configurable perf addr2line: Remove global variable addr2line_timeout_ms
tools/perf/builtin-diff.c | 4 ++-- tools/perf/util/addr2line.c | 20 ++++++++++---------- tools/perf/util/addr2line.h | 2 -- tools/perf/util/block-info.c | 2 +- tools/perf/util/config.c | 6 ++++-- tools/perf/util/libbfd.c | 2 +- tools/perf/util/symbol_conf.h | 3 ++- 7 files changed, 20 insertions(+), 19 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/3 perf config: Rename symbol_conf::disable_add2line_warn
Rename member symbol_conf::disable_add2line_warn to symbol_conf::addr2line_disable_warn to make it consistent with other addr2line_xxx constants.
No functional change.
--- tools/perf/builtin-diff.c | 4 ++-- tools/perf/util/addr2line.c | 12 ++++++------ tools/perf/util/block-info.c | 2 +- tools/perf/util/libbfd.c | 2 +- tools/perf/util/symbol_conf.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
tools/perf/builtin-diff.c +2 -2
@@ -1353,7 +1353,7 @@ static int cycles_printf(struct hist_entry *he, struct hist_entry *pair,/* * Avoid printing the warning "addr2line_init failed for ..." */ - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; bi = block_he->block_info;
@@ -1987,7 +1987,7 @@ int cmd_diff(int argc, const char **argv)if (compute ==COMPUTE_STREAM ) { symbol_conf.show_branchflag_count = true; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; callchain_param.mode =CHAIN_FLAT ; callchain_param.key =CCKEY_SRCLINE ; callchain_param.branch_callstack =1 ;
tools/perf/util/addr2line.c +6 -6
@@ -123,7 +123,7 @@ static enum cmd_a2l_style cmd_addr2line_configure(struct child_process *a2l, con lines =3 ;pr_debug3 ("Detected binutils addr2line style\n" ); }else { -if (!symbol_conf.disable_add2line_warn) { +if (!symbol_conf.addr2line_disable_warn) {char *output =NULL ;size_t output_len;
@@ -310,7 +310,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: addr2line_subprocess_init failed\n" , __func__, dso_name); goto out; }
@@ -330,7 +330,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, len =snprintf (buf,sizeof (buf),"%016" PRIx64"\n,\n" , addr); written = len >0 ?write (a2l->in, buf, len) :-1 ;if (written != len) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not send request\n" , __func__, dso_name); goto out; }
@@ -339,7 +339,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read first record\n" , __func__, dso_name); goto out;case 0 :
@@ -355,7 +355,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, /*addr=*/1, /*first=*/true, NULL, NULL, NULL)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read sentinel record\n" , __func__, dso_name);break ;
@@ -363,7 +363,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,/* The sentinel as expected. */ break ;default : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: unexpected record instead of sentinel" , __func__, dso_name);break ;
tools/perf/util/block-info.c +1 -1
@@ -303,7 +303,7 @@ static int block_range_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,char buf[128 ];char *start_line, *end_line; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; start_line =map__srcline (he->ms.map, bi->sym->start + bi->start, he->ms.sym);
tools/perf/util/libbfd.c +1 -1
@@ -233,7 +233,7 @@ int libbfd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("addr2line_init failed for %s\n" , dso_name);return 0 ; }
tools/perf/util/symbol_conf.h +1 -1
@@ -51,7 +51,7 @@ struct symbol_conf { report_block, report_individual_block, inline_name, - disable_add2line_warn, + addr2line_disable_warn, no_buildid_mmap2, guest_code, lazy_load_kernel_maps,
Signature · 1 line
2.53.0
Re: [PATCH 1/3] perf config: Rename symbol_conf::disable_add2line_warn
Quoted 9 lines · Thomas Richter
Rename member
symbol_conf::disable_add2line_warntosymbol_conf::addr2line_disable_warnto make it consistent with otheraddr2line_xxxconstants.
No functional change.Fixes 257046a36750a ("perf srcline: Fallback between addr2line implementations")Cc Ian Rogers <[email protected]>Signed-off-by Thomas Richter <[email protected]>
Thanks,
Ian
Quoted 130 lines
--- tools/perf/builtin-diff.c | 4 ++-- tools/perf/util/addr2line.c | 12 ++++++------ tools/perf/util/block-info.c | 2 +- tools/perf/util/libbfd.c | 2 +- tools/perf/util/symbol_conf.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)tools/perf/builtin-diff.c +2
-2@@ -1353,7 +1353,7 @@ static int cycles_printf(struct hist_entry *he, struct hist_entry *pair,/* * Avoid printing the warning "addr2line_init failed for ..." */ - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; bi = block_he->block_info;@@ -1987,7 +1987,7 @@ int cmd_diff(int argc, const char **argv)if (compute ==COMPUTE_STREAM ) { symbol_conf.show_branchflag_count = true; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; callchain_param.mode =CHAIN_FLAT ; callchain_param.key =CCKEY_SRCLINE ; callchain_param.branch_callstack =1 ;tools/perf/util/addr2line.c +6
-6@@ -123,7 +123,7 @@ static enum cmd_a2l_style cmd_addr2line_configure(struct child_process *a2l, con lines =3 ;pr_debug3 ("Detected binutils addr2line style\n" ); }else { -if (!symbol_conf.disable_add2line_warn) { +if (!symbol_conf.addr2line_disable_warn) {char *output =NULL ;size_t output_len;@@ -310,7 +310,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: addr2line_subprocess_init failed\n" , __func__, dso_name); goto out; }@@ -330,7 +330,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, len =snprintf (buf,sizeof (buf),"%016" PRIx64"\n,\n" , addr); written = len >0 ?write (a2l->in, buf, len) :-1 ;if (written != len) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not send request\n" , __func__, dso_name); goto out; }@@ -339,7 +339,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read first record\n" , __func__, dso_name); goto out;case 0 :@@ -355,7 +355,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, /*addr=*/1, /*first=*/true, NULL, NULL, NULL)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read sentinel record\n" , __func__, dso_name);break ;@@ -363,7 +363,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,/* The sentinel as expected. */ break ;default : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: unexpected record instead of sentinel" , __func__, dso_name);break ;tools/perf/util/block-info.c +1
-1@@ -303,7 +303,7 @@ static int block_range_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,char buf[128 ];char *start_line, *end_line; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; start_line =map__srcline (he->ms.map, bi->sym->start + bi->start, he->ms.sym);tools/perf/util/libbfd.c +1
-1@@ -233,7 +233,7 @@ int libbfd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("addr2line_init failed for %s\n" , dso_name);return 0 ; }tools/perf/util/symbol_conf.h +1
-2@@ -51,7 +51,7 @@ struct symbol_conf { report_block, report_individual_block, inline_name, - disable_add2line_warn, + addr2line_disable_warn, no_buildid_mmap2, guest_code, lazy_load_kernel_maps, --2.53.0
Ian Rogers
reviewerRe: [PATCH 1/3] perf config: Rename symbol_conf::disable_add2line_warn
Quoted 8 lines · Ian Rogers
Quoted 6 lines · Thomas Richter
Rename member
symbol_conf::disable_add2line_warntosymbol_conf::addr2line_disable_warnto make it consistent with otheraddr2line_xxxconstants.
No functional change.
Quoted 5 lines
Quoted 3 lines
Fixes 257046a36750a ("perf srcline: Fallback between addr2line implementations")Cc Ian Rogers <[email protected]>Signed-off-by Thomas Richter <[email protected]>Reviewed-by Ian Rogers <[email protected]>
Ping. Thanks,
Ian
Quoted 133 lines
Thanks,
IanQuoted 130 lines
--- tools/perf/builtin-diff.c | 4 ++-- tools/perf/util/addr2line.c | 12 ++++++------ tools/perf/util/block-info.c | 2 +- tools/perf/util/libbfd.c | 2 +- tools/perf/util/symbol_conf.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)tools/perf/builtin-diff.c +2
-2@@ -1353,7 +1353,7 @@ static int cycles_printf(struct hist_entry *he, struct hist_entry *pair,/* * Avoid printing the warning "addr2line_init failed for ..." */ - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; bi = block_he->block_info;@@ -1987,7 +1987,7 @@ int cmd_diff(int argc, const char **argv)if (compute ==COMPUTE_STREAM ) { symbol_conf.show_branchflag_count = true; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; callchain_param.mode =CHAIN_FLAT ; callchain_param.key =CCKEY_SRCLINE ; callchain_param.branch_callstack =1 ;tools/perf/util/addr2line.c +6
-6@@ -123,7 +123,7 @@ static enum cmd_a2l_style cmd_addr2line_configure(struct child_process *a2l, con lines =3 ;pr_debug3 ("Detected binutils addr2line style\n" ); }else { -if (!symbol_conf.disable_add2line_warn) { +if (!symbol_conf.addr2line_disable_warn) {char *output =NULL ;size_t output_len;@@ -310,7 +310,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: addr2line_subprocess_init failed\n" , __func__, dso_name); goto out; }@@ -330,7 +330,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, len =snprintf (buf,sizeof (buf),"%016" PRIx64"\n,\n" , addr); written = len >0 ?write (a2l->in, buf, len) :-1 ;if (written != len) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not send request\n" , __func__, dso_name); goto out; }@@ -339,7 +339,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read first record\n" , __func__, dso_name); goto out;case 0 :@@ -355,7 +355,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, /*addr=*/1, /*first=*/true, NULL, NULL, NULL)) {case -1 : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: could not read sentinel record\n" , __func__, dso_name);break ;@@ -363,7 +363,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,/* The sentinel as expected. */ break ;default : -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("%s %s: unexpected record instead of sentinel" , __func__, dso_name);break ;tools/perf/util/block-info.c +1
-1@@ -303,7 +303,7 @@ static int block_range_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,char buf[128 ];char *start_line, *end_line; - symbol_conf.disable_add2line_warn = true; + symbol_conf.addr2line_disable_warn = true; start_line =map__srcline (he->ms.map, bi->sym->start + bi->start, he->ms.sym);tools/perf/util/libbfd.c +1
-1@@ -233,7 +233,7 @@ int libbfd__addr2line(const char *dso_name, u64 addr, }if (a2l ==NULL ) { -if (!symbol_conf.disable_add2line_warn) +if (!symbol_conf.addr2line_disable_warn)pr_warning ("addr2line_init failed for %s\n" , dso_name);return 0 ; }tools/perf/util/symbol_conf.h +1
-2@@ -51,7 +51,7 @@ struct symbol_conf { report_block, report_individual_block, inline_name, - disable_add2line_warn, + addr2line_disable_warn, no_buildid_mmap2, guest_code, lazy_load_kernel_maps, --2.53.0
PATCH 2/3 perf config: Make symbol_conf::addr2line_disable_warn configurable
In reply to Thomas RichterMake symbol_conf::addr2line_disable_warn configurable by reading the perfconfig file. Use section core and addr2line-disable-warn = value.
Example:
# perf config -l core.addr2line-timeout=500 core.addr2line-disable-warn=1 #
--- tools/perf/util/config.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/config.c +3 -0
@@ -461,6 +461,9 @@ static int perf_default_core_config(const char *var, const char *value)if (!strcmp (var,"core.addr2line-timeout" )) addr2line_timeout_ms =strtoul (value,NULL ,10 ); +if (!strcmp (var,"core.addr2line-disable-warn" )) + symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 ); +/* Add other config variables here. */ return 0 ; }
Signature · 1 line
2.53.0
Re: [PATCH 2/3] perf config: Make symbol_conf::addr2line_disable_warn configurable
Quoted 5 lines · Thomas Richter
Make
symbol_conf::addr2line_disable_warnconfigurable by reading the perfconfig file. Use section core and addr2line-disable-warn = value.
Quoted 8 lines
Example:
# perf config -l core.addr2line-timeout=500 core.addr2line-disable-warn=1 #Signed-off-by Thomas Richter <[email protected]>Cc Ian Rogers <[email protected]>
Thanks,
Ian
Quoted 21 lines
--- tools/perf/util/config.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/util/config.c +3
-1@@ -461,6 +461,9 @@ static int perf_default_core_config(const char *var, const char *value)if (!strcmp (var,"core.addr2line-timeout" )) addr2line_timeout_ms =strtoul (value,NULL ,10 ); +if (!strcmp (var,"core.addr2line-disable-warn" )) + symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 ); +/* Add other config variables here. */ return 0 ; } --2.53.0
Namhyung Kim
maintainerRe: [PATCH 2/3] perf config: Make symbol_conf::addr2line_disable_warn configurable
In reply to Thomas RichterQuoted 10 lines · Thomas Richter
Make
symbol_conf::addr2line_disable_warnconfigurable by reading the perfconfig file. Use section core and addr2line-disable-warn = value.Example:
# perf config -l core.addr2line-timeout=500 core.addr2line-disable-warn=1 #
Quoted 5 lines
Signed-off-by Thomas Richter <[email protected]>Cc Ian Rogers <[email protected]>--- tools/perf/util/config.c | 3 +++ 1 file changed, 3 insertions(+)
Can you please update Documentation/perf-config.txt as well?
tools/perf/util/config.c static int perf_default_core_config(const char *var, const char *value) · line 465
Quoted 11 lines
tools/perf/util/config.c +2
-0@@ -461,6 +461,9 @@ static int perf_default_core_config(const char *var, const char *value)if (!strcmp (var,"core.addr2line-timeout" )) addr2line_timeout_ms =strtoul (value,NULL ,10 ); +if (!strcmp (var,"core.addr2line-disable-warn" )) + symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 );
Sashiko review: Please use perf_config_bool().
Thanks,
Namhyung
Quoted 7 lines
tools/perf/util/config.c +1
-0+/* Add other config variables here. */ return 0 ; }Signature · 1 line
2.53.0
PATCH 3/3 perf addr2line: Remove global variable addr2line_timeout_ms
In reply to Thomas RichterRemove global variable addr2line_timeout_ms and add is as member to symbol_conf structure. No functional change.
--- tools/perf/util/addr2line.c | 8 ++++---- tools/perf/util/addr2line.h | 2 -- tools/perf/util/config.c | 3 +-- tools/perf/util/symbol_conf.h | 1 + 4 files changed, 6 insertions(+), 8 deletions(-)
tools/perf/util/addr2line.c +4 -4
@@ -18,9 +18,6 @@#define MAX_INLINE_NEST 1024 -/* If addr2line doesn't return data for 5 seconds then timeout. */ -int addr2line_timeout_ms =5 *1000 ; -static int filename_split (char *filename,unsigned int *line_nr) {char *sep;
@@ -87,6 +84,9 @@ static struct child_process *addr2line_subprocess_init(const char *addr2line_patreturn NULL ; } +if (!symbol_conf.addr2line_timeout_ms) + symbol_conf.addr2line_timeout_ms =5 *1000 ; +return a2l; }
@@ -335,7 +335,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, goto out; }io__init (&io, a2l->out, buf,sizeof (buf)); - io.timeout_ms = addr2line_timeout_ms; + io.timeout_ms = symbol_conf.addr2line_timeout_ms;switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 :
tools/perf/util/addr2line.h +0 -2
@@ -8,8 +8,6 @@ struct dso;struct inline_node ;struct symbol ; -extern int addr2line_timeout_ms; - int cmd__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso,
tools/perf/util/config.c +1 -2
@@ -19,7 +19,6 @@#include "util/hist.h" /* perf_hist_config */ #include "util/stat.h" /* perf_stat__set_big_num */ #include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */ -#include "util/addr2line.h" /* addr2line_timeout_ms */ #include "srcline.h" #include "build-id.h" #include "debug.h"
@@ -459,7 +458,7 @@ static int perf_default_core_config(const char *var, const char *value) proc_map_timeout =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-timeout" )) - addr2line_timeout_ms =strtoul (value,NULL ,10 ); + symbol_conf.addr2line_timeout_ms =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-disable-warn" )) symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 );
tools/perf/util/symbol_conf.h +1 -0
@@ -80,6 +80,7 @@ struct symbol_conf { *bt_stop_list_str;const char *addr2line_path;enum a2l_style addr2line_style[MAX_A2L_STYLE ]; +int addr2line_timeout_ms;unsigned long time_quantum;struct strlist *dso_list, *comm_list,
Signature · 1 line
2.53.0
Re: [PATCH 3/3] perf addr2line: Remove global variable addr2line_timeout_ms
Quoted 7 lines · Thomas Richter
Remove global variable
addr2line_timeout_msand add is as member tosymbol_confstructure. No functional change.Fixes 257046a36750a ("perf srcline: Fallback between addr2line implementations")Cc Ian Rogers <[email protected]>Signed-off-by Thomas Richter <[email protected]>
I'm a bit curious about the no functional change and the Fixes tag :-) I think the trend for addr2line is to use libdw. The forking of both objdump and addr2line is quite brittle and slow.
Thanks,
Ian
Quoted 89 lines
--- tools/perf/util/addr2line.c | 8 ++++---- tools/perf/util/addr2line.h | 2 -- tools/perf/util/config.c | 3 +-- tools/perf/util/symbol_conf.h | 1 + 4 files changed, 6 insertions(+), 8 deletions(-)tools/perf/util/addr2line.c +4
-4@@ -18,9 +18,6 @@#define MAX_INLINE_NEST 1024 -/* If addr2line doesn't return data for 5 seconds then timeout. */ -int addr2line_timeout_ms =5 *1000 ; -static int filename_split (char *filename,unsigned int *line_nr) {char *sep;@@ -87,6 +84,9 @@ static struct child_process *addr2line_subprocess_init(const char *addr2line_patreturn NULL ; } +if (!symbol_conf.addr2line_timeout_ms) + symbol_conf.addr2line_timeout_ms =5 *1000 ; +return a2l; }@@ -335,7 +335,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, goto out; }io__init (&io, a2l->out, buf,sizeof (buf)); - io.timeout_ms = addr2line_timeout_ms; + io.timeout_ms = symbol_conf.addr2line_timeout_ms;switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 :tools/perf/util/addr2line.h +0
-2@@ -8,8 +8,6 @@ struct dso;struct inline_node ;struct symbol ; -extern int addr2line_timeout_ms; - int cmd__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso,tools/perf/util/config.c +1
-2@@ -19,7 +19,6 @@#include "util/hist.h" /* perf_hist_config */ #include "util/stat.h" /* perf_stat__set_big_num */ #include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */ -#include "util/addr2line.h" /* addr2line_timeout_ms */ #include "srcline.h" #include "build-id.h" #include "debug.h" @@ -459,7 +458,7 @@ static int perf_default_core_config(const char *var, const char *value) proc_map_timeout =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-timeout" )) - addr2line_timeout_ms =strtoul (value,NULL ,10 ); + symbol_conf.addr2line_timeout_ms =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-disable-warn" )) symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 );tools/perf/util/symbol_conf.h +1
-1@@ -80,6 +80,7 @@ struct symbol_conf { *bt_stop_list_str;const char *addr2line_path;enum a2l_style addr2line_style[MAX_A2L_STYLE ]; +int addr2line_timeout_ms;unsigned long time_quantum;struct strlist *dso_list, *comm_list, --2.53.0
Namhyung Kim
maintainerRe: [PATCH 3/3] perf addr2line: Remove global variable addr2line_timeout_ms
Quoted 10 lines · Ian Rogers
Quoted 7 lines · Thomas Richter
Remove global variable
addr2line_timeout_msand add is as member tosymbol_confstructure. No functional change.Fixes 257046a36750a ("perf srcline: Fallback between addr2line implementations")Cc Ian Rogers <[email protected]>Signed-off-by Thomas Richter <[email protected]>I'm a bit curious about the no functional change and the Fixes tag :-)
Right, it should belong somewhere else.
Quoted 33 lines
I think the trend for addr2line is to use libdw. The forking of both objdump and addr2line is quite brittle and slow.
Reviewed-by Ian Rogers <[email protected]>Thanks,
IanQuoted 25 lines
--- tools/perf/util/addr2line.c | 8 ++++---- tools/perf/util/addr2line.h | 2 -- tools/perf/util/config.c | 3 +-- tools/perf/util/symbol_conf.h | 1 + 4 files changed, 6 insertions(+), 8 deletions(-)tools/perf/util/addr2line.c +0
-3@@ -18,9 +18,6 @@#define MAX_INLINE_NEST 1024 -/* If addr2line doesn't return data for 5 seconds then timeout. */ -int addr2line_timeout_ms =5 *1000 ; -static int filename_split (char *filename,unsigned int *line_nr) {char *sep;@@ -87,6 +84,9 @@ static struct child_process *addr2line_subprocess_init(const char *addr2line_patreturn NULL ; }
Quoted 2 lines
tools/perf/util/addr2line.c static struct child_process *addr2line_subprocess_init(const char *addr2line_pat · line 88
Quoted 2 lines
tools/perf/util/addr2line.c +2
-0+if (!symbol_conf.addr2line_timeout_ms) + symbol_conf.addr2line_timeout_ms =5 *1000 ;
Please put this in the util/symbol.c where the symbol_conf is defined.
Thanks,
Namhyung
Quoted 62 lines
Quoted 62 lines
tools/perf/util/addr2line.c +2
-1+return a2l; }@@ -335,7 +335,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, goto out; }io__init (&io, a2l->out, buf,sizeof (buf)); - io.timeout_ms = addr2line_timeout_ms; + io.timeout_ms = symbol_conf.addr2line_timeout_ms;switch (read_addr2line_record (&io, cmd_a2l_style, dso_name, addr,/*first=*/ true, &record_function, &record_filename, &record_line_nr)) {case -1 :tools/perf/util/addr2line.h +0
-2@@ -8,8 +8,6 @@ struct dso;struct inline_node ;struct symbol ; -extern int addr2line_timeout_ms; - int cmd__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso,tools/perf/util/config.c +1
-2@@ -19,7 +19,6 @@#include "util/hist.h" /* perf_hist_config */ #include "util/stat.h" /* perf_stat__set_big_num */ #include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */ -#include "util/addr2line.h" /* addr2line_timeout_ms */ #include "srcline.h" #include "build-id.h" #include "debug.h" @@ -459,7 +458,7 @@ static int perf_default_core_config(const char *var, const char *value) proc_map_timeout =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-timeout" )) - addr2line_timeout_ms =strtoul (value,NULL ,10 ); + symbol_conf.addr2line_timeout_ms =strtoul (value,NULL ,10 );if (!strcmp (var,"core.addr2line-disable-warn" )) symbol_conf.addr2line_disable_warn =strtoul (value,NULL ,10 );tools/perf/util/symbol_conf.h +1
-1@@ -80,6 +80,7 @@ struct symbol_conf { *bt_stop_list_str;const char *addr2line_path;enum a2l_style addr2line_style[MAX_A2L_STYLE ]; +int addr2line_timeout_ms;unsigned long time_quantum;struct strlist *dso_list, *comm_list, --2.53.0