mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-05 08:18:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

perf addr2line.c: Rename a2l_style to cmd_a2l_style

Browse Source 
The a2l_style is only relevant to the command line version, so rename
to make this clearer.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Tony Jones <tonyj@suse.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers
2026-01-10 20:13:34 -08:00
committed by Arnaldo Carvalho de Melo
parent 88c51002d0
commit ec9426655d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/util/addr2line.c
View File

@@ -90,16 +90,16 @@ static struct child_process *addr2line_subprocess_init(const char *addr2line_pat
return a2l;
}
enum a2l_style {
enum cmd_a2l_style {
BROKEN,
GNU_BINUTILS,
LLVM,
};
static enum a2l_style addr2line_configure(struct child_process *a2l, const char *dso_name)
static enum cmd_a2l_style cmd_addr2line_configure(struct child_process *a2l, const char *dso_name)
{
static bool cached;
static enum a2l_style style;
static enum cmd_a2l_style style;
if (!cached) {
char buf[128];
@@ -149,7 +149,7 @@ static enum a2l_style addr2line_configure(struct child_process *a2l, const char
}
static int read_addr2line_record(struct io *io,
enum a2l_style style,
enum cmd_a2l_style style,
const char *dso_name,
u64 addr,
bool first,
@@ -298,7 +298,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,
char buf[128];
ssize_t written;
struct io io = { .eof = false };
enum a2l_style a2l_style;
enum cmd_a2l_style cmd_a2l_style;
if (!a2l) {
if (!filename__has_section(dso_name, ".debug_line"))
@@ -314,8 +314,8 @@ int cmd__addr2line(const char *dso_name, u64 addr,
pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
goto out;
}
a2l_style = addr2line_configure(a2l, dso_name);
if (a2l_style == BROKEN)
cmd_a2l_style = cmd_addr2line_configure(a2l, dso_name);
if (cmd_a2l_style == BROKEN)
goto out;
/*
@@ -336,7 +336,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,
}
io__init(&io, a2l->out, buf, sizeof(buf));
io.timeout_ms = addr2line_timeout_ms;
switch (read_addr2line_record(&io, a2l_style, dso_name, addr, /*first=*/true,
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)
@@ -351,7 +351,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,
* binutils, also force a non-zero address as we're no longer
* reading that record.
*/
switch (read_addr2line_record(&io, a2l_style, dso_name,
switch (read_addr2line_record(&io, cmd_a2l_style, dso_name,
/*addr=*/1, /*first=*/true,
NULL, NULL, NULL)) {
case -1:
@@ -397,7 +397,7 @@ int cmd__addr2line(const char *dso_name, u64 addr,
* as we're reading records beyond the first.
*/
while ((record_status = read_addr2line_record(&io,
a2l_style,
cmd_a2l_style,
dso_name,
/*addr=*/1,
/*first=*/false,