mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

perf: Use strerror_r instead of strerror

Browse source 
Use strerror_r instead of strerror in error messages for thread-safety.
This also introduce STRERR_BUFSIZE macro for the default size of message
buffer for strerror_r.

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/20140814022232.3545.14026.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Masami Hiramatsu 2014-08-14 02:22:32 +00:00 committed by Arnaldo Carvalho de Melo
parent 6eb0866096
commit b2348e1d8a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/perf/perf.c
View file

@ -313,6 +313,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
int status; int status;
struct stat st; struct stat st;
const char *prefix; const char *prefix;
char sbuf[STRERR_BUFSIZE];
prefix = NULL; prefix = NULL;
if (p->option & RUN_SETUP) if (p->option & RUN_SETUP)
@ -343,7 +344,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
status = 1; status = 1;
/* Check for ENOSPC and EIO errors.. */ /* Check for ENOSPC and EIO errors.. */
if (fflush(stdout)) { if (fflush(stdout)) {
fprintf(stderr, "write failure on standard output: %s", strerror(errno)); fprintf(stderr, "write failure on standard output: %s",
strerror_r(errno, sbuf, sizeof(sbuf)));
goto out; goto out;
} }
if (ferror(stdout)) { if (ferror(stdout)) {
@ -351,7 +353,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
goto out; goto out;
} }
if (fclose(stdout)) { if (fclose(stdout)) {
fprintf(stderr, "close failed on standard output: %s", strerror(errno)); fprintf(stderr, "close failed on standard output: %s",
strerror_r(errno, sbuf, sizeof(sbuf)));
goto out; goto out;
} }
status = 0; status = 0;
@ -466,6 +469,7 @@ void pthread__unblock_sigwinch(void)
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
const char *cmd; const char *cmd;
char sbuf[STRERR_BUFSIZE];
/* The page_size is placed in util object. */ /* The page_size is placed in util object. */
page_size = sysconf(_SC_PAGE_SIZE); page_size = sysconf(_SC_PAGE_SIZE);
@ -561,7 +565,7 @@ int main(int argc, const char **argv)
} }
fprintf(stderr, "Failed to run command '%s': %s\n", fprintf(stderr, "Failed to run command '%s': %s\n",
cmd, strerror(errno)); cmd, strerror_r(errno, sbuf, sizeof(sbuf)));
out: out:
return 1; return 1;
} }

3
tools/perf/util/debug.h
View file

@ -3,6 +3,7 @@
#define __PERF_DEBUG_H #define __PERF_DEBUG_H
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include "event.h" #include "event.h"
#include "../ui/helpline.h" #include "../ui/helpline.h"
#include "../ui/progress.h" #include "../ui/progress.h"
@ -36,6 +37,8 @@ extern int debug_ordered_events;
#define pr_oe_time(t, fmt, ...) pr_time_N(1, debug_ordered_events, t, pr_fmt(fmt), ##__VA_ARGS__) #define pr_oe_time(t, fmt, ...) pr_time_N(1, debug_ordered_events, t, pr_fmt(fmt), ##__VA_ARGS__)
#define pr_oe_time2(t, fmt, ...) pr_time_N(2, debug_ordered_events, t, pr_fmt(fmt), ##__VA_ARGS__) #define pr_oe_time2(t, fmt, ...) pr_time_N(2, debug_ordered_events, t, pr_fmt(fmt), ##__VA_ARGS__)
#define STRERR_BUFSIZE 128 /* For the buffer size of strerror_r */
int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
void trace_event(union perf_event *event); void trace_event(union perf_event *event);