diff options
author | Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> | 2014-08-13 22:22:41 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-08-15 12:06:28 -0400 |
commit | 942a91ed3ffff0267944ed3161ae292d0960fd44 (patch) | |
tree | 678f4fe19921cace273a3cde035ee91e6157aefa /tools/perf/builtin-trace.c | |
parent | 809adea685f7dbc9bdcc38b27d24801c461d8413 (diff) |
perf trace: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error message for thead-safety.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20140814022241.3545.97543.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | tools/perf/builtin-trace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index d080b9cf0354..a9e96ff49c7f 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -1750,7 +1750,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, | |||
1750 | signed_print: | 1750 | signed_print: |
1751 | fprintf(trace->output, ") = %d", ret); | 1751 | fprintf(trace->output, ") = %d", ret); |
1752 | } else if (ret < 0 && sc->fmt->errmsg) { | 1752 | } else if (ret < 0 && sc->fmt->errmsg) { |
1753 | char bf[256]; | 1753 | char bf[STRERR_BUFSIZE]; |
1754 | const char *emsg = strerror_r(-ret, bf, sizeof(bf)), | 1754 | const char *emsg = strerror_r(-ret, bf, sizeof(bf)), |
1755 | *e = audit_errno_to_name(-ret); | 1755 | *e = audit_errno_to_name(-ret); |
1756 | 1756 | ||
@@ -2044,6 +2044,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) | |||
2044 | int err = -1, i; | 2044 | int err = -1, i; |
2045 | unsigned long before; | 2045 | unsigned long before; |
2046 | const bool forks = argc > 0; | 2046 | const bool forks = argc > 0; |
2047 | char sbuf[STRERR_BUFSIZE]; | ||
2047 | 2048 | ||
2048 | trace->live = true; | 2049 | trace->live = true; |
2049 | 2050 | ||
@@ -2105,7 +2106,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv) | |||
2105 | 2106 | ||
2106 | err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false); | 2107 | err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false); |
2107 | if (err < 0) { | 2108 | if (err < 0) { |
2108 | fprintf(trace->output, "Couldn't mmap the events: %s\n", strerror(errno)); | 2109 | fprintf(trace->output, "Couldn't mmap the events: %s\n", |
2110 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
2109 | goto out_delete_evlist; | 2111 | goto out_delete_evlist; |
2110 | } | 2112 | } |
2111 | 2113 | ||