Skip to content

Commit 003a86b

Browse files
captain5050namhyung
authored andcommitted
perf trace: Avoid global perf_env with evsel__env
There is no session in perf trace unless in replay mode, so in host mode no session can be associated with the evlist. If the evsel__env call fails resort to the host_env that's part of the trace. Remove errno_to_name as it becomes a called once 1-line function once the argument is turned into a perf_env, just call perf_env__arch_strerrno directly. Signed-off-by: Ian Rogers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent 69ac747 commit 003a86b

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

tools/perf/builtin-trace.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,13 +2898,6 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_sample *sam
28982898
return sample__fprintf_callchain(sample, 38, print_opts, get_tls_callchain_cursor(), symbol_conf.bt_stop_list, trace->output);
28992899
}
29002900

2901-
static const char *errno_to_name(struct evsel *evsel, int err)
2902-
{
2903-
struct perf_env *env = evsel__env(evsel);
2904-
2905-
return perf_env__arch_strerrno(env, err);
2906-
}
2907-
29082901
static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
29092902
union perf_event *event __maybe_unused,
29102903
struct perf_sample *sample)
@@ -2990,8 +2983,9 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
29902983
} else if (ret < 0) {
29912984
errno_print: {
29922985
char bf[STRERR_BUFSIZE];
2993-
const char *emsg = str_error_r(-ret, bf, sizeof(bf)),
2994-
*e = errno_to_name(evsel, -ret);
2986+
struct perf_env *env = evsel__env(evsel) ?: &trace->host_env;
2987+
const char *emsg = str_error_r(-ret, bf, sizeof(bf));
2988+
const char *e = perf_env__arch_strerrno(env, err);
29952989

29962990
fprintf(trace->output, "-1 %s (%s)", e, emsg);
29972991
}

0 commit comments

Comments
 (0)