perf: Replace strerror with strerror_r for thread-safety
cover perf: Replace strerror with strerror_r for thread-safety
Hi,
(sorry, ignore the previous series, this is complete one)
Here is a series to get rid of thread-unsafe strerror() from perf tools. Of course, there maybe other thread-unsafe functions, so this goes just one step forward. :)
This introduces STRERR_BUFSIZE(=128) macro for allocating local buffer, but some strerror_r()s don't use that. If there are already a local buffer on the stack, and if it is bigger than STRERR_BUFSIZE, I chose it for strerror_r()'s buffer.
By the way, while doing this cleanup, I've found some confusions on the code. Currently perf has 3 ways to output messages except for standard (f)printf, pr_XXX, ui__XXX and warning/error functions. Is there any differences among those APIs? What is the expected use cases for them?
For example, a pure printf is in [email protected] but it seems to be ui__error, because the error output next to it uses that. However, other parts use pr_XXX too. It seems inconsistent.
Thank you,
---
Masami Hiramatsu (13):
perf probe: Don't use strerror if strlist__add failed
perf: Use strerror_r instead of strerror
perf probe: Make error messages thread-safe perf/util: Replace strerror with strerror_r for thread-safety perf top: Use strerror_r instead of strerror
perf trace: Use strerror_r instead of strerror perf record: Use strerror_r instead of strerror perf test: Use strerror_r instead of strerror
perf sched: Use strerror_r instead of strerror perf buildid-cache: Use strerror_r instead of strerror perf kvm: Use strerror_r instead of strerror
perf help: Use strerror_r instead of strerror
perf stat: Use strerror_r instead of strerror
tools/perf/builtin-buildid-cache.c | 7 +++--- tools/perf/builtin-help.c | 20 ++++++++++++++--- tools/perf/builtin-kvm.c | 7 ++++-- tools/perf/builtin-probe.c | 5 +++- tools/perf/builtin-record.c | 7 +++--- tools/perf/builtin-sched.c | 4 +++ tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 6 +++-- tools/perf/perf.c | 10 ++++++--- tools/perf/tests/builtin-test.c | 4 +++ tools/perf/tests/mmap-basic.c | 7 +++--- tools/perf/tests/open-syscall-all-cpus.c | 5 +++- tools/perf/tests/open-syscall-tp-fields.c | 7 ++++-- tools/perf/tests/open-syscall.c | 3 ++- tools/perf/tests/perf-record.c | 13 ++++++++--- tools/perf/tests/rdpmc.c | 6 +++-- tools/perf/tests/sw-clock.c | 6 +++-- tools/perf/tests/task-exit.c | 6 +++-- tools/perf/util/cloexec.c | 6 +++-- tools/perf/util/data.c | 8 +++++-- tools/perf/util/debug.h | 3 +++ tools/perf/util/dso.c | 8 +++++-- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 7 ++++-- tools/perf/util/parse-events.c | 5 +++- tools/perf/util/probe-event.c | 34 ++++++++++++++++------------- tools/perf/util/probe-finder.c | 7 ++++-- tools/perf/util/run-command.c | 9 ++++++-- tools/perf/util/util.c | 5 +++- 30 files changed, 150 insertions(+), 71 deletions(-)
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center Hitachi, Ltd., Yokohama Research Laboratory
E-mail: [email protected]
PATCH 1/13 perf probe: Don't use strerror if strlist__add failed
Since the strlist__add doesn't involves any IO, the failure reason must be ENOMEM or EINVAL, moreover this is just a debug message, we don't need to show the error string.
And also, if get_probe_trace_command_rawlist() returns NULL, it doesn't mean the rawlist is empty, there is an error. So caller must use -ENOMEM for the error.
--- tools/perf/util/probe-event.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/probe-event.c +4 -2
@@ -1876,7 +1876,7 @@ static struct strlist *get_probe_trace_command_rawlist(int fd) p[idx] ='\0' ; ret =strlist__add (sl, buf);if (ret <0 ) { -pr_debug ("strlist__add failed: %s\n" ,strerror (-ret)); +pr_debug ("strlist__add failed (%d)\n" , ret);strlist__delete (sl);return NULL ; }
@@ -1935,7 +1935,7 @@ static int __show_perf_probe_events(int fd, bool is_kprobe) rawlist =get_probe_trace_command_rawlist (fd);if (!rawlist) -return -ENOENT ; +return -ENOMEM ;strlist__for_each (ent, rawlist) { ret =parse_probe_trace_command (ent->s, &tev);
@@ -2002,6 +2002,8 @@ static struct strlist *get_probe_trace_event_names(int fd, bool include_group)memset (&tev,0 ,sizeof (tev)); rawlist =get_probe_trace_command_rawlist (fd); +if (!rawlist) +return NULL ; sl =strlist__new (true,NULL );strlist__for_each (ent, rawlist) { ret =parse_probe_trace_command (ent->s, &tev);
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf probe: Don' t use strerror if strlist__add failed
perf probe: Don't use strerror if strlist__add failed
Commit-ID: 6eb08660962a91212902869672dab5199827cbfd Gitweb: http://git.kernel.org/tip/6eb08660962a91212902869672dab5199827cbfd Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:30 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 10:53:36 -0300
perf probe: Don't use strerror if strlist__add failed
Since the strlist__add doesn't involves any IO, the failure reason must be ENOMEM or EINVAL, moreover this is just a debug message, we don't need to show the error string.
And also, if get_probe_trace_command_rawlist() returns NULL, it doesn't mean the rawlist is empty, there is an error. So caller must use -ENOMEM for the error.
--- tools/perf/util/probe-event.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/probe-event.c +4 -2
@@ -1881,7 +1881,7 @@ static struct strlist *get_probe_trace_command_rawlist(int fd) p[idx] ='\0' ; ret =strlist__add (sl, buf);if (ret <0 ) { -pr_debug ("strlist__add failed: %s\n" ,strerror (-ret)); +pr_debug ("strlist__add failed (%d)\n" , ret);strlist__delete (sl);return NULL ; }
@@ -1940,7 +1940,7 @@ static int __show_perf_probe_events(int fd, bool is_kprobe) rawlist =get_probe_trace_command_rawlist (fd);if (!rawlist) -return -ENOENT ; +return -ENOMEM ;strlist__for_each (ent, rawlist) { ret =parse_probe_trace_command (ent->s, &tev);
@@ -2007,6 +2007,8 @@ static struct strlist *get_probe_trace_event_names(int fd, bool include_group)memset (&tev,0 ,sizeof (tev)); rawlist =get_probe_trace_command_rawlist (fd); +if (!rawlist) +return NULL ; sl =strlist__new (true,NULL );strlist__for_each (ent, rawlist) { ret =parse_probe_trace_command (ent->s, &tev);
PATCH 2/13 perf: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse 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.
--- tools/perf/perf.c | 10 +++++++--- tools/perf/util/debug.h | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-)
tools/perf/perf.c +7 -3
@@ -313,6 +313,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)int status;struct stat st;const char *prefix; +char sbuf[STRERR_BUFSIZE ]; prefix =NULL ;if (p->option &RUN_SETUP )
@@ -343,7 +344,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) status =1 ;/* Check for ENOSPC and EIO errors.. */ 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; }if (ferror (stdout)) {
@@ -351,7 +353,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) goto out; }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; } status =0 ;
@@ -466,6 +469,7 @@ void pthread__unblock_sigwinch(void)int main (int argc,const char **argv) {const char *cmd; +char sbuf[STRERR_BUFSIZE ];/* The page_size is placed in util object. */ 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" , - cmd,strerror (errno)); + cmd,strerror_r (errno, sbuf,sizeof (sbuf))); out:return 1 ; }
tools/perf/util/debug.h +3 -0
@@ -3,6 +3,7 @@#define __PERF_DEBUG_H#include <stdbool.h> +#include <string.h> #include "event.h" #include "../ui/helpline.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_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 )));void trace_event (union perf_event *event);
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf: Use strerror_r instead of strerror
perf: Use strerror_r instead of strerror
Commit-ID: b2348e1d8a67c58de44820587fabc4f987eafbb6 Gitweb: http://git.kernel.org/tip/b2348e1d8a67c58de44820587fabc4f987eafbb6 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:32 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 10:54:29 -0300
perf: Use strerror_r instead of strerror
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.
--- tools/perf/perf.c | 10 +++++++--- tools/perf/util/debug.h | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-)
tools/perf/perf.c +7 -3
@@ -313,6 +313,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)int status;struct stat st;const char *prefix; +char sbuf[STRERR_BUFSIZE ]; prefix =NULL ;if (p->option &RUN_SETUP )
@@ -343,7 +344,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) status =1 ;/* Check for ENOSPC and EIO errors.. */ 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; }if (ferror (stdout)) {
@@ -351,7 +353,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) goto out; }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; } status =0 ;
@@ -466,6 +469,7 @@ void pthread__unblock_sigwinch(void)int main (int argc,const char **argv) {const char *cmd; +char sbuf[STRERR_BUFSIZE ];/* The page_size is placed in util object. */ 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" , - cmd,strerror (errno)); + cmd,strerror_r (errno, sbuf,sizeof (sbuf))); out:return 1 ; }
tools/perf/util/debug.h +3 -0
@@ -3,6 +3,7 @@#define __PERF_DEBUG_H#include <stdbool.h> +#include <string.h> #include "event.h" #include "../ui/helpline.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_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 )));void trace_event (union perf_event *event);
PATCH 3/13 perf probe: Make error messages thread-safe
In reply to Masami HiramatsuTo make error messages thread-safe, this replaces strerror with strerror_r for warnings, and just shows the return value instead of using strerror for debug messages.
--- tools/perf/builtin-probe.c | 5 ++++- tools/perf/util/probe-event.c | 28 +++++++++++++++------------- tools/perf/util/probe-finder.c | 7 +++++-- 3 files changed, 24 insertions(+), 16 deletions(-)
tools/perf/builtin-probe.c +4 -1
@@ -290,8 +290,11 @@ static void cleanup_params(void)static void pr_err_with_code (const char *msg,int err) { +char sbuf[STRERR_BUFSIZE ]; +pr_err ("%s" , msg); -pr_debug (" Reason: %s (Code: %d)" ,strerror (-err), err); +pr_debug (" Reason: %s (Code: %d)" , +strerror_r (-err, sbuf,sizeof (sbuf)), err);pr_err ("\n" ); }
tools/perf/util/probe-event.c +15 -13
@@ -565,7 +565,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) { -char buf[LINEBUF_SIZE ]; +char buf[LINEBUF_SIZE ], sbuf[STRERR_BUFSIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;const char *prefix =NULL ;
@@ -585,7 +585,8 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)return 1 ; error:if (ferror (fp)) { -pr_warning ("File read error: %s\n" ,strerror (errno)); +pr_warning ("File read error: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; }return 0 ;
@@ -618,6 +619,7 @@ static int __show_line_range(struct line_range *lr, const char *module)FILE *fp;int ret;char *tmp; +char sbuf[STRERR_BUFSIZE ];/* Search a line range */ dinfo =open_debuginfo (module);
@@ -656,7 +658,7 @@ static int __show_line_range(struct line_range *lr, const char *module) fp =fopen (lr->path,"r" );if (fp ==NULL ) {pr_warning ("Failed to open %s: %s\n" , lr->path, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf)));return -errno; }/* Skip to starting line number */
@@ -1405,8 +1407,7 @@ int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf, size_t len)return tmp - buf; error: -pr_debug ("Failed to synthesize perf probe argument: %s\n" , -strerror (-ret)); +pr_debug ("Failed to synthesize perf probe argument: %d\n" , ret);return ret; }
@@ -1455,8 +1456,7 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)return buf; error: -pr_debug ("Failed to synthesize perf probe point: %s\n" , -strerror (-ret)); +pr_debug ("Failed to synthesize perf probe point: %d\n" , ret);free (buf);return NULL ; }
@@ -1782,7 +1782,7 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)static void print_open_warning (int err,bool is_kprobe) { -char sbuf[128 ]; +char sbuf[STRERR_BUFSIZE ];if (err == -ENOENT ) {const char *config;
@@ -1812,7 +1812,7 @@ static void print_both_open_warning(int kerr, int uerr)pr_warning ("Please rebuild kernel with CONFIG_KPROBE_EVENTS " "or/and CONFIG_UPROBE_EVENTS.\n" ); else { -char sbuf[128 ]; +char sbuf[STRERR_BUFSIZE ];pr_warning ("Failed to open kprobe events: %s.\n" ,strerror_r (-kerr, sbuf,sizeof (sbuf))); pr_warning("Failed to open uprobe events: %s.\n",
@@ -2033,6 +2033,7 @@ static int write_probe_trace_event(int fd, struct probe_trace_event *tev) {int ret =0 ;char *buf =synthesize_probe_trace_command (tev); +char sbuf[STRERR_BUFSIZE ];if (!buf) {pr_debug ("Failed to synthesize probe trace event.\n" );
@@ -2044,7 +2045,7 @@ static int write_probe_trace_event(int fd, struct probe_trace_event *tev) ret =write (fd, buf,strlen (buf));if (ret <=0 )pr_warning ("Failed to write event: %s\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); }free (buf);return ret;
@@ -2058,7 +2059,7 @@ static int get_new_event_name(char *buf, size_t len, const char *base,/* Try no suffix */ ret =e_snprintf (buf, len,"%s" , base);if (ret <0 ) { -pr_debug ("snprintf() failed: %s\n" ,strerror (-ret)); +pr_debug ("snprintf() failed: %d\n" , ret);return ret; }if (!strlist__has_entry (namelist, buf))
@@ -2074,7 +2075,7 @@ static int get_new_event_name(char *buf, size_t len, const char *base,for (i =1 ; i <MAX_EVENT_INDEX ; i++) { ret =e_snprintf (buf, len,"%s_%d" , base, i);if (ret <0 ) { -pr_debug ("snprintf() failed: %s\n" ,strerror (-ret)); +pr_debug ("snprintf() failed: %d\n" , ret);return ret; }if (!strlist__has_entry (namelist, buf))
@@ -2439,7 +2440,8 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)printf ("Removed event: %s\n" , ent->s);return 0 ; error: -pr_warning ("Failed to delete event: %s\n" ,strerror (-ret)); +pr_warning ("Failed to delete event: %s\n" , +strerror_r (-ret, buf,sizeof (buf)));return ret; }
tools/perf/util/probe-finder.c +5 -2
@@ -281,6 +281,7 @@ static int convert_variable_type(Dwarf_Die *vr_die,struct probe_trace_arg_ref **ref_ptr = &tvar->ref;Dwarf_Die type;char buf[16 ]; +char sbuf[STRERR_BUFSIZE ];int bsize, boffs, total;int ret;
@@ -367,7 +368,7 @@ formatted:if (ret >=16 ) ret = -E2BIG ;pr_warning ("Failed to convert variable type: %s\n" , -strerror (-ret)); +strerror_r (-ret, sbuf,sizeof (sbuf)));return ret; } tvar->type =strdup (buf);
@@ -779,10 +780,12 @@ static int find_lazy_match_lines(struct intlist *list,size_t line_len;ssize_t len;int count =0 , linenum =1 ; +char sbuf[STRERR_BUFSIZE ]; fp =fopen (fname,"r" );if (!fp) { -pr_warning ("Failed to open %s: %s\n" , fname,strerror (errno)); +pr_warning ("Failed to open %s: %s\n" , fname, +strerror_r (errno, sbuf,sizeof (sbuf)));return -errno; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf probe: Make error messages thread-safe
perf probe: Make error messages thread-safe
Commit-ID: 5f03cba41590b5e7db5b66d2b2aa3e146ff8a84f Gitweb: http://git.kernel.org/tip/5f03cba41590b5e7db5b66d2b2aa3e146ff8a84f Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:34 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 10:56:53 -0300
perf probe: Make error messages thread-safe
To make error messages thread-safe, this replaces strerror with strerror_r for warnings, and just shows the return value instead of using strerror for debug messages.
--- tools/perf/builtin-probe.c | 5 ++++- tools/perf/util/probe-event.c | 28 +++++++++++++++------------- tools/perf/util/probe-finder.c | 7 +++++-- 3 files changed, 24 insertions(+), 16 deletions(-)
tools/perf/builtin-probe.c +4 -1
@@ -290,8 +290,11 @@ static void cleanup_params(void)static void pr_err_with_code (const char *msg,int err) { +char sbuf[STRERR_BUFSIZE ]; +pr_err ("%s" , msg); -pr_debug (" Reason: %s (Code: %d)" ,strerror (-err), err); +pr_debug (" Reason: %s (Code: %d)" , +strerror_r (-err, sbuf,sizeof (sbuf)), err);pr_err ("\n" ); }
tools/perf/util/probe-event.c +15 -13
@@ -573,7 +573,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) { -char buf[LINEBUF_SIZE ]; +char buf[LINEBUF_SIZE ], sbuf[STRERR_BUFSIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;const char *prefix =NULL ;
@@ -593,7 +593,8 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)return 1 ; error:if (ferror (fp)) { -pr_warning ("File read error: %s\n" ,strerror (errno)); +pr_warning ("File read error: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; }return 0 ;
@@ -626,6 +627,7 @@ static int __show_line_range(struct line_range *lr, const char *module)FILE *fp;int ret;char *tmp; +char sbuf[STRERR_BUFSIZE ];/* Search a line range */ dinfo =open_debuginfo (module, false);
@@ -662,7 +664,7 @@ static int __show_line_range(struct line_range *lr, const char *module) fp =fopen (lr->path,"r" );if (fp ==NULL ) {pr_warning ("Failed to open %s: %s\n" , lr->path, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf)));return -errno; }/* Skip to starting line number */
@@ -1410,8 +1412,7 @@ int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf, size_t len)return tmp - buf; error: -pr_debug ("Failed to synthesize perf probe argument: %s\n" , -strerror (-ret)); +pr_debug ("Failed to synthesize perf probe argument: %d\n" , ret);return ret; }
@@ -1460,8 +1461,7 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)return buf; error: -pr_debug ("Failed to synthesize perf probe point: %s\n" , -strerror (-ret)); +pr_debug ("Failed to synthesize perf probe point: %d\n" , ret);free (buf);return NULL ; }
@@ -1787,7 +1787,7 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)static void print_open_warning (int err,bool is_kprobe) { -char sbuf[128 ]; +char sbuf[STRERR_BUFSIZE ];if (err == -ENOENT ) {const char *config;
@@ -1817,7 +1817,7 @@ static void print_both_open_warning(int kerr, int uerr)pr_warning ("Please rebuild kernel with CONFIG_KPROBE_EVENTS " "or/and CONFIG_UPROBE_EVENTS.\n" ); else { -char sbuf[128 ]; +char sbuf[STRERR_BUFSIZE ];pr_warning ("Failed to open kprobe events: %s.\n" ,strerror_r (-kerr, sbuf,sizeof (sbuf))); pr_warning("Failed to open uprobe events: %s.\n",
@@ -2038,6 +2038,7 @@ static int write_probe_trace_event(int fd, struct probe_trace_event *tev) {int ret =0 ;char *buf =synthesize_probe_trace_command (tev); +char sbuf[STRERR_BUFSIZE ];if (!buf) {pr_debug ("Failed to synthesize probe trace event.\n" );
@@ -2049,7 +2050,7 @@ static int write_probe_trace_event(int fd, struct probe_trace_event *tev) ret =write (fd, buf,strlen (buf));if (ret <=0 )pr_warning ("Failed to write event: %s\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); }free (buf);return ret;
@@ -2063,7 +2064,7 @@ static int get_new_event_name(char *buf, size_t len, const char *base,/* Try no suffix */ ret =e_snprintf (buf, len,"%s" , base);if (ret <0 ) { -pr_debug ("snprintf() failed: %s\n" ,strerror (-ret)); +pr_debug ("snprintf() failed: %d\n" , ret);return ret; }if (!strlist__has_entry (namelist, buf))
@@ -2079,7 +2080,7 @@ static int get_new_event_name(char *buf, size_t len, const char *base,for (i =1 ; i <MAX_EVENT_INDEX ; i++) { ret =e_snprintf (buf, len,"%s_%d" , base, i);if (ret <0 ) { -pr_debug ("snprintf() failed: %s\n" ,strerror (-ret)); +pr_debug ("snprintf() failed: %d\n" , ret);return ret; }if (!strlist__has_entry (namelist, buf))
@@ -2444,7 +2445,8 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)printf ("Removed event: %s\n" , ent->s);return 0 ; error: -pr_warning ("Failed to delete event: %s\n" ,strerror (-ret)); +pr_warning ("Failed to delete event: %s\n" , +strerror_r (-ret, buf,sizeof (buf)));return ret; }
tools/perf/util/probe-finder.c +5 -2
@@ -281,6 +281,7 @@ static int convert_variable_type(Dwarf_Die *vr_die,struct probe_trace_arg_ref **ref_ptr = &tvar->ref;Dwarf_Die type;char buf[16 ]; +char sbuf[STRERR_BUFSIZE ];int bsize, boffs, total;int ret;
@@ -367,7 +368,7 @@ formatted:if (ret >=16 ) ret = -E2BIG ;pr_warning ("Failed to convert variable type: %s\n" , -strerror (-ret)); +strerror_r (-ret, sbuf,sizeof (sbuf)));return ret; } tvar->type =strdup (buf);
@@ -779,10 +780,12 @@ static int find_lazy_match_lines(struct intlist *list,size_t line_len;ssize_t len;int count =0 , linenum =1 ; +char sbuf[STRERR_BUFSIZE ]; fp =fopen (fname,"r" );if (!fp) { -pr_warning ("Failed to open %s: %s\n" , fname,strerror (errno)); +pr_warning ("Failed to open %s: %s\n" , fname, +strerror_r (errno, sbuf,sizeof (sbuf)));return -errno; }
PATCH 4/13 perf/util: Replace strerror with strerror_r for thread-safety
In reply to Masami HiramatsuReplaces all strerror with strerror_r in util for making the perf lib thread-safe.
--- tools/perf/util/cloexec.c | 6 ++++-- tools/perf/util/data.c | 8 ++++++-- tools/perf/util/dso.c | 8 ++++++-- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 7 +++++-- tools/perf/util/parse-events.c | 5 ++++- tools/perf/util/run-command.c | 9 +++++++-- tools/perf/util/util.c | 5 +++-- 8 files changed, 36 insertions(+), 14 deletions(-)
tools/perf/util/cloexec.c +4 -2
@@ -3,6 +3,7 @@#include "../perf.h" #include "cloexec.h" #include "asm/bug.h" +#include "debug.h" static unsigned long flag =PERF_FLAG_FD_CLOEXEC ;
@@ -18,6 +19,7 @@ static int perf_flag_probe(void)int err;int cpu;pid_t pid =-1 ; +char sbuf[STRERR_BUFSIZE ]; cpu =sched_getcpu ();if (cpu <0 )
@@ -42,7 +44,7 @@ static int perf_flag_probe(void)WARN_ONCE (err !=EINVAL && err !=EBUSY ,"perf_event_open(..., PERF_FLAG_FD_CLOEXEC) failed with unexpected error %d (%s)\n" , - err,strerror (err)); + err,strerror_r (err, sbuf,sizeof (sbuf)));/* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */ fd =sys_perf_event_open (&attr, pid, cpu,-1 ,0 );
@@ -50,7 +52,7 @@ static int perf_flag_probe(void)if (WARN_ONCE (fd <0 && err !=EBUSY ,"perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n" , - err,strerror (err))) + err,strerror_r (err, sbuf,sizeof (sbuf))))return -1 ;close (fd);
tools/perf/util/data.c +6 -2
@@ -50,12 +50,14 @@ static int open_file_read(struct perf_data_file *file) {struct stat st;int fd; +char sbuf[STRERR_BUFSIZE ]; fd =open (file->path,O_RDONLY );if (fd <0 ) {int err = errno; -pr_err ("failed to open %s: %s" , file->path,strerror (err)); +pr_err ("failed to open %s: %s" , file->path, +strerror_r (err, sbuf,sizeof (sbuf)));if (err ==ENOENT && !strcmp (file->path,"perf.data" ))pr_err (" (try 'perf record' first)" );pr_err ("\n" );
@@ -88,6 +90,7 @@ static int open_file_read(struct perf_data_file *file)static int open_file_write (struct perf_data_file *file) {int fd; +char sbuf[STRERR_BUFSIZE ];if (check_backup (file))return -1 ;
@@ -95,7 +98,8 @@ static int open_file_write(struct perf_data_file *file) fd =open (file->path,O_CREAT |O_RDWR |O_TRUNC ,S_IRUSR |S_IWUSR );if (fd <0 ) -pr_err ("failed to open %s : %s\n" , file->path,strerror (errno)); +pr_err ("failed to open %s : %s\n" , file->path, +strerror_r (errno, sbuf,sizeof (sbuf)));return fd; }
tools/perf/util/dso.c +6 -2
@@ -162,13 +162,15 @@ static void close_first_dso(void);static int do_open (char *name) {int fd; +char sbuf[STRERR_BUFSIZE ]; do { fd = open(name, O_RDONLY); if (fd >= 0) return fd; - pr_debug("dso open failed, mmap: %s\n", strerror(errno)); + pr_debug("dso open failed, mmap: %s\n", + strerror_r(errno, sbuf, sizeof(sbuf))); if (!dso__data_open_cnt || errno != EMFILE) break;
@@ -530,10 +532,12 @@ static ssize_t cached_read(struct dso *dso, u64 offset, u8 *data, ssize_t size)static int data_file_size (struct dso *dso) {struct stat st; +char sbuf[STRERR_BUFSIZE ];if (!dso->data.file_size) {if (fstat (dso->data.fd, &st)) { -pr_err ("dso mmap failed, fstat: %s\n" ,strerror (errno)); +pr_err ("dso mmap failed, fstat: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; } dso->data.file_size = st.st_size;
tools/perf/util/evlist.c +1 -1
@@ -1295,7 +1295,7 @@ int perf_evlist__strerror_open(struct perf_evlist *evlist __maybe_unused, int err, char *buf, size_t size) { int printed, value; -char sbuf[128 ], *emsg =strerror_r (err, sbuf,sizeof (sbuf)); +char sbuf[STRERR_BUFSIZE ], *emsg =strerror_r (err, sbuf,sizeof (sbuf));switch (err) {case EACCES :
tools/perf/util/evsel.c +5 -2
@@ -2027,6 +2027,8 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,int perf_evsel__open_strerror (struct perf_evsel *evsel,struct target *target,int err,char *msg,size_t size) { +char sbuf[STRERR_BUFSIZE ]; +switch (err) {case EPERM :case EACCES :
@@ -2072,8 +2074,9 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, }return scnprintf (msg, size, -"The sys_perf_event_open() syscall returned with %d (%s) for event (%s). \n" +"The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n" "/bin/dmesg may provide additional information.\n" "No CONFIG_PERF_EVENTS=y kernel support configured?\n" , - err,strerror (err),perf_evsel__name (evsel)); + err,strerror_r (err, sbuf,sizeof (sbuf)), +perf_evsel__name (evsel)); }
tools/perf/util/parse-events.c +4 -1
@@ -10,6 +10,7 @@#include "symbol.h" #include "cache.h" #include "header.h" +#include "debug.h" #include <api/fs/debugfs.h> #include "parse-events-bison.h" #define YY_EXTRA_TYPE int
@@ -1006,9 +1007,11 @@ void print_tracepoint_events(const char *subsys_glob, const char *event_glob,struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;char evt_path[MAXPATHLEN ];char dir_path[MAXPATHLEN ]; +char sbuf[STRERR_BUFSIZE ];if (debugfs_valid_mountpoint (tracing_events_path)) { -printf (" [ Tracepoints not available: %s ]\n" ,strerror (errno)); +printf (" [ Tracepoints not available: %s ]\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return ; }
tools/perf/util/run-command.c +7 -2
@@ -1,6 +1,7 @@#include "cache.h" #include "run-command.h" #include "exec_cmd.h" +#include "debug.h" static inline void close_pair (int fd[2 ]) {
@@ -19,6 +20,7 @@ int start_command(struct child_process *cmd) {int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ]; +char sbuf[STRERR_BUFSIZE ];/* * In case of errors we must keep the promise to close FDs
@@ -99,7 +101,7 @@ int start_command(struct child_process *cmd)if (cmd->dir &&chdir (cmd->dir))die ("exec %s: cd to %s failed (%s)" , cmd->argv[0 ], - cmd->dir,strerror (errno)); + cmd->dir,strerror_r (errno, sbuf,sizeof (sbuf)));if (cmd->env) {for (; *cmd->env; cmd->env++) {if (strchr (*cmd->env,'=' ))
@@ -153,6 +155,8 @@ int start_command(struct child_process *cmd)static int wait_or_whine (pid_t pid) { +char sbuf[STRERR_BUFSIZE ]; +for (;;) {int status, code;pid_t waiting =waitpid (pid, &status,0 );
@@ -160,7 +164,8 @@ static int wait_or_whine(pid_t pid)if (waiting <0 ) {if (errno ==EINTR )continue ; -error ("waitpid failed (%s)" ,strerror (errno)); +error ("waitpid failed (%s)" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -ERR_RUN_COMMAND_WAITPID ; }if (waiting != pid)
tools/perf/util/util.c +3 -2
@@ -456,6 +456,7 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep)size_t size =0 , alloc_size =0 ;void *bf =NULL , *nbf;int fd, n, err =0 ; +char sbuf[STRERR_BUFSIZE ]; fd =open (filename,O_RDONLY );if (fd <0 )
@@ -476,8 +477,8 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep) n =read (fd, bf + size, alloc_size - size);if (n <0 ) {if (size) { -pr_warning ("read failed %d: %s\n" , - errno,strerror (errno)); +pr_warning ("read failed %d: %s\n" , errno, +strerror_r (errno, sbuf,sizeof (sbuf))); err =0 ; }else err = -errno;
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf util: Replace strerror with strerror_r for thread-safety
perf util: Replace strerror with strerror_r for thread-safety
Commit-ID: 6e81c74cbf4b64620170da14844f1dc8a9a5950f Gitweb: http://git.kernel.org/tip/6e81c74cbf4b64620170da14844f1dc8a9a5950f Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:36 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 10:58:35 -0300
perf util: Replace strerror with strerror_r for thread-safety
Replaces all strerror with strerror_r in util for making the perf lib thread-safe.
--- tools/perf/util/cloexec.c | 6 ++++-- tools/perf/util/data.c | 8 ++++++-- tools/perf/util/dso.c | 8 ++++++-- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 7 +++++-- tools/perf/util/parse-events.c | 5 ++++- tools/perf/util/run-command.c | 9 +++++++-- tools/perf/util/util.c | 5 +++-- 8 files changed, 36 insertions(+), 14 deletions(-)
tools/perf/util/cloexec.c +4 -2
@@ -3,6 +3,7 @@#include "../perf.h" #include "cloexec.h" #include "asm/bug.h" +#include "debug.h" static unsigned long flag =PERF_FLAG_FD_CLOEXEC ;
@@ -18,6 +19,7 @@ static int perf_flag_probe(void)int err;int cpu;pid_t pid =-1 ; +char sbuf[STRERR_BUFSIZE ]; cpu =sched_getcpu ();if (cpu <0 )
@@ -42,7 +44,7 @@ static int perf_flag_probe(void)WARN_ONCE (err !=EINVAL && err !=EBUSY ,"perf_event_open(..., PERF_FLAG_FD_CLOEXEC) failed with unexpected error %d (%s)\n" , - err,strerror (err)); + err,strerror_r (err, sbuf,sizeof (sbuf)));/* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */ fd =sys_perf_event_open (&attr, pid, cpu,-1 ,0 );
@@ -50,7 +52,7 @@ static int perf_flag_probe(void)if (WARN_ONCE (fd <0 && err !=EBUSY ,"perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n" , - err,strerror (err))) + err,strerror_r (err, sbuf,sizeof (sbuf))))return -1 ;close (fd);
tools/perf/util/data.c +6 -2
@@ -50,12 +50,14 @@ static int open_file_read(struct perf_data_file *file) {struct stat st;int fd; +char sbuf[STRERR_BUFSIZE ]; fd =open (file->path,O_RDONLY );if (fd <0 ) {int err = errno; -pr_err ("failed to open %s: %s" , file->path,strerror (err)); +pr_err ("failed to open %s: %s" , file->path, +strerror_r (err, sbuf,sizeof (sbuf)));if (err ==ENOENT && !strcmp (file->path,"perf.data" ))pr_err (" (try 'perf record' first)" );pr_err ("\n" );
@@ -88,6 +90,7 @@ static int open_file_read(struct perf_data_file *file)static int open_file_write (struct perf_data_file *file) {int fd; +char sbuf[STRERR_BUFSIZE ];if (check_backup (file))return -1 ;
@@ -95,7 +98,8 @@ static int open_file_write(struct perf_data_file *file) fd =open (file->path,O_CREAT |O_RDWR |O_TRUNC ,S_IRUSR |S_IWUSR );if (fd <0 ) -pr_err ("failed to open %s : %s\n" , file->path,strerror (errno)); +pr_err ("failed to open %s : %s\n" , file->path, +strerror_r (errno, sbuf,sizeof (sbuf)));return fd; }
tools/perf/util/dso.c +6 -2
@@ -162,13 +162,15 @@ static void close_first_dso(void);static int do_open (char *name) {int fd; +char sbuf[STRERR_BUFSIZE ]; do { fd = open(name, O_RDONLY); if (fd >= 0) return fd; - pr_debug("dso open failed, mmap: %s\n", strerror(errno)); + pr_debug("dso open failed, mmap: %s\n", + strerror_r(errno, sbuf, sizeof(sbuf))); if (!dso__data_open_cnt || errno != EMFILE) break;
@@ -530,10 +532,12 @@ static ssize_t cached_read(struct dso *dso, u64 offset, u8 *data, ssize_t size)static int data_file_size (struct dso *dso) {struct stat st; +char sbuf[STRERR_BUFSIZE ];if (!dso->data.file_size) {if (fstat (dso->data.fd, &st)) { -pr_err ("dso mmap failed, fstat: %s\n" ,strerror (errno)); +pr_err ("dso mmap failed, fstat: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; } dso->data.file_size = st.st_size;
tools/perf/util/evlist.c +1 -1
@@ -1295,7 +1295,7 @@ int perf_evlist__strerror_open(struct perf_evlist *evlist __maybe_unused, int err, char *buf, size_t size) { int printed, value; -char sbuf[128 ], *emsg =strerror_r (err, sbuf,sizeof (sbuf)); +char sbuf[STRERR_BUFSIZE ], *emsg =strerror_r (err, sbuf,sizeof (sbuf));switch (err) {case EACCES :
tools/perf/util/evsel.c +5 -2
@@ -2027,6 +2027,8 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,int perf_evsel__open_strerror (struct perf_evsel *evsel,struct target *target,int err,char *msg,size_t size) { +char sbuf[STRERR_BUFSIZE ]; +switch (err) {case EPERM :case EACCES :
@@ -2072,8 +2074,9 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, }return scnprintf (msg, size, -"The sys_perf_event_open() syscall returned with %d (%s) for event (%s). \n" +"The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n" "/bin/dmesg may provide additional information.\n" "No CONFIG_PERF_EVENTS=y kernel support configured?\n" , - err,strerror (err),perf_evsel__name (evsel)); + err,strerror_r (err, sbuf,sizeof (sbuf)), +perf_evsel__name (evsel)); }
tools/perf/util/parse-events.c +4 -1
@@ -10,6 +10,7 @@#include "symbol.h" #include "cache.h" #include "header.h" +#include "debug.h" #include <api/fs/debugfs.h> #include "parse-events-bison.h" #define YY_EXTRA_TYPE int
@@ -1006,9 +1007,11 @@ void print_tracepoint_events(const char *subsys_glob, const char *event_glob,struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;char evt_path[MAXPATHLEN ];char dir_path[MAXPATHLEN ]; +char sbuf[STRERR_BUFSIZE ];if (debugfs_valid_mountpoint (tracing_events_path)) { -printf (" [ Tracepoints not available: %s ]\n" ,strerror (errno)); +printf (" [ Tracepoints not available: %s ]\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return ; }
tools/perf/util/run-command.c +7 -2
@@ -1,6 +1,7 @@#include "cache.h" #include "run-command.h" #include "exec_cmd.h" +#include "debug.h" static inline void close_pair (int fd[2 ]) {
@@ -19,6 +20,7 @@ int start_command(struct child_process *cmd) {int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ]; +char sbuf[STRERR_BUFSIZE ];/* * In case of errors we must keep the promise to close FDs
@@ -99,7 +101,7 @@ int start_command(struct child_process *cmd)if (cmd->dir &&chdir (cmd->dir))die ("exec %s: cd to %s failed (%s)" , cmd->argv[0 ], - cmd->dir,strerror (errno)); + cmd->dir,strerror_r (errno, sbuf,sizeof (sbuf)));if (cmd->env) {for (; *cmd->env; cmd->env++) {if (strchr (*cmd->env,'=' ))
@@ -153,6 +155,8 @@ int start_command(struct child_process *cmd)static int wait_or_whine (pid_t pid) { +char sbuf[STRERR_BUFSIZE ]; +for (;;) {int status, code;pid_t waiting =waitpid (pid, &status,0 );
@@ -160,7 +164,8 @@ static int wait_or_whine(pid_t pid)if (waiting <0 ) {if (errno ==EINTR )continue ; -error ("waitpid failed (%s)" ,strerror (errno)); +error ("waitpid failed (%s)" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -ERR_RUN_COMMAND_WAITPID ; }if (waiting != pid)
tools/perf/util/util.c +3 -2
@@ -456,6 +456,7 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep)size_t size =0 , alloc_size =0 ;void *bf =NULL , *nbf;int fd, n, err =0 ; +char sbuf[STRERR_BUFSIZE ]; fd =open (filename,O_RDONLY );if (fd <0 )
@@ -476,8 +477,8 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep) n =read (fd, bf + size, alloc_size - size);if (n <0 ) {if (size) { -pr_warning ("read failed %d: %s\n" , - errno,strerror (errno)); +pr_warning ("read failed %d: %s\n" , errno, +strerror_r (errno, sbuf,sizeof (sbuf))); err =0 ; }else err = -errno;
PATCH 5/13 perf top: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-top.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-top.c +1 -1
@@ -899,7 +899,7 @@ try_again:if (perf_evlist__mmap (evlist, opts->mmap_pages, false) <0 ) {ui__error ("Failed to mmap with %d (%s)\n" , - errno,strerror (errno)); + errno,strerror_r (errno, msg,sizeof (msg))); goto out_err; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf top: Use strerror_r instead of strerror
perf top: Use strerror_r instead of strerror
Commit-ID: 809adea685f7dbc9bdcc38b27d24801c461d8413 Gitweb: http://git.kernel.org/tip/809adea685f7dbc9bdcc38b27d24801c461d8413 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:38 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:05:00 -0300
perf top: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-top.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-top.c +1 -1
@@ -899,7 +899,7 @@ try_again:if (perf_evlist__mmap (evlist, opts->mmap_pages, false) <0 ) {ui__error ("Failed to mmap with %d (%s)\n" , - errno,strerror (errno)); + errno,strerror_r (errno, msg,sizeof (msg))); goto out_err; }
PATCH 6/13 perf trace: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error message for thead-safety.
--- tools/perf/builtin-trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +4 -2
@@ -1750,7 +1750,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, signed_print:fprintf (trace->output,") = %d" , ret); }else if (ret <0 && sc->fmt->errmsg) { -char bf[256 ]; +char bf[STRERR_BUFSIZE ];const char *emsg =strerror_r (-ret, bf,sizeof (bf)), *e =audit_errno_to_name (-ret);
@@ -2044,6 +2044,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)int err =-1 , i;unsigned long before;const bool forks = argc >0 ; +char sbuf[STRERR_BUFSIZE ]; trace->live = true;
@@ -2105,7 +2106,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv) err =perf_evlist__mmap (evlist, trace->opts.mmap_pages, false);if (err <0 ) { -fprintf (trace->output,"Couldn't mmap the events: %s\n" ,strerror (errno)); +fprintf (trace->output,"Couldn't mmap the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf trace: Use strerror_r instead of strerror
perf trace: Use strerror_r instead of strerror
Commit-ID: 942a91ed3ffff0267944ed3161ae292d0960fd44 Gitweb: http://git.kernel.org/tip/942a91ed3ffff0267944ed3161ae292d0960fd44 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:41 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:06:28 -0300
perf trace: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error message for thead-safety.
--- tools/perf/builtin-trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +4 -2
@@ -1750,7 +1750,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, signed_print:fprintf (trace->output,") = %d" , ret); }else if (ret <0 && sc->fmt->errmsg) { -char bf[256 ]; +char bf[STRERR_BUFSIZE ];const char *emsg =strerror_r (-ret, bf,sizeof (bf)), *e =audit_errno_to_name (-ret);
@@ -2044,6 +2044,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)int err =-1 , i;unsigned long before;const bool forks = argc >0 ; +char sbuf[STRERR_BUFSIZE ]; trace->live = true;
@@ -2105,7 +2106,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv) err =perf_evlist__mmap (evlist, trace->opts.mmap_pages, false);if (err <0 ) { -fprintf (trace->output,"Couldn't mmap the events: %s\n" ,strerror (errno)); +fprintf (trace->output,"Couldn't mmap the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
PATCH 7/13 perf record: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-record.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/builtin-record.c +4 -3
@@ -161,7 +161,7 @@ try_again:if (perf_evlist__apply_filters (evlist)) {error ("failed to set filter with %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, msg,sizeof (msg))); rc =-1 ; goto out; }
@@ -175,7 +175,8 @@ try_again: "(current value: %u)\n", opts->mmap_pages); rc = -errno; }else { -pr_err ("failed to mmap with %d (%s)\n" , errno,strerror (errno)); +pr_err ("failed to mmap with %d (%s)\n" , errno, +strerror_r (errno, msg,sizeof (msg))); rc = -errno; } goto out;
@@ -480,7 +481,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) }if (forks && workload_exec_errno) { -char msg[512 ]; +char msg[STRERR_BUFSIZE ];const char *emsg =strerror_r (workload_exec_errno, msg,sizeof (msg));pr_err ("Workload failed: %s\n" , emsg); err =-1 ;
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf record: Use strerror_r instead of strerror
perf record: Use strerror_r instead of strerror
Commit-ID: 35550da389ba8752f024a44ef14b74001c4fc4d3 Gitweb: http://git.kernel.org/tip/35550da389ba8752f024a44ef14b74001c4fc4d3 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:43 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:07:14 -0300
perf record: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-record.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/builtin-record.c +4 -3
@@ -161,7 +161,7 @@ try_again:if (perf_evlist__apply_filters (evlist)) {error ("failed to set filter with %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, msg,sizeof (msg))); rc =-1 ; goto out; }
@@ -175,7 +175,8 @@ try_again: "(current value: %u)\n", opts->mmap_pages); rc = -errno; }else { -pr_err ("failed to mmap with %d (%s)\n" , errno,strerror (errno)); +pr_err ("failed to mmap with %d (%s)\n" , errno, +strerror_r (errno, msg,sizeof (msg))); rc = -errno; } goto out;
@@ -480,7 +481,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) }if (forks && workload_exec_errno) { -char msg[512 ]; +char msg[STRERR_BUFSIZE ];const char *emsg =strerror_r (workload_exec_errno, msg,sizeof (msg));pr_err ("Workload failed: %s\n" , emsg); err =-1 ;
PATCH 8/13 perf test: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/tests/builtin-test.c | 4 +++- tools/perf/tests/mmap-basic.c | 7 ++++--- tools/perf/tests/open-syscall-all-cpus.c | 5 +++-- tools/perf/tests/open-syscall-tp-fields.c | 7 +++++-- tools/perf/tests/open-syscall.c | 3 ++- tools/perf/tests/perf-record.c | 13 +++++++++---- tools/perf/tests/rdpmc.c | 6 ++++-- tools/perf/tests/sw-clock.c | 6 ++++-- tools/perf/tests/task-exit.c | 6 ++++-- 9 files changed, 38 insertions(+), 19 deletions(-)
tools/perf/tests/builtin-test.c +3 -1
@@ -185,9 +185,11 @@ static bool perf_test__matches(int curr, int argc, const char *argv[])static int run_test (struct test *test) {int status, err =-1 , child =fork (); +char sbuf[STRERR_BUFSIZE ];if (child <0 ) { -pr_err ("failed to fork test: %s\n" ,strerror (errno)); +pr_err ("failed to fork test: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; }
tools/perf/tests/mmap-basic.c +4 -3
@@ -31,6 +31,7 @@ int test__basic_mmap(void)unsigned int nr_events[nsyscalls], expected_nr_events[nsyscalls], i, j;struct perf_evsel *evsels[nsyscalls], *evsel; +char sbuf[STRERR_BUFSIZE ]; threads =thread_map__new (-1 ,getpid (),UINT_MAX );if (threads ==NULL ) {
@@ -49,7 +50,7 @@ int test__basic_mmap(void)sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set);if (sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set) <0 ) {pr_debug ("sched_setaffinity() failed on CPU %d: %s " , - cpus->map[0 ],strerror (errno)); + cpus->map[0 ],strerror_r (errno, sbuf,sizeof (sbuf))); goto out_free_cpus; }
@@ -79,7 +80,7 @@ int test__basic_mmap(void)if (perf_evsel__open (evsels[i], cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -89,7 +90,7 @@ int test__basic_mmap(void)if (perf_evlist__mmap (evlist,128 , true) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/open-syscall-all-cpus.c +3 -2
@@ -12,6 +12,7 @@ int test__open_syscall_event_on_all_cpus(void)unsigned int nr_open_calls =111 , i;cpu_set_t cpu_set;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +char sbuf[STRERR_BUFSIZE ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -35,7 +36,7 @@ int test__open_syscall_event_on_all_cpus(void)if (perf_evsel__open (evsel, cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_evsel_delete; }
@@ -56,7 +57,7 @@ int test__open_syscall_event_on_all_cpus(void)if (sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set) <0 ) {pr_debug ("sched_setaffinity() failed on CPU %d: %s " , cpus->map[cpu], -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_close_fd; }for (i =0 ; i < ncalls; ++i) {
tools/perf/tests/open-syscall-tp-fields.c +5 -2
@@ -22,6 +22,7 @@ int test__syscall_open_tp_fields(void)struct perf_evlist *evlist =perf_evlist__new ();struct perf_evsel *evsel;int err =-1 , i, nr_events =0 , nr_polls =0 ; +char sbuf[STRERR_BUFSIZE ];if (evlist ==NULL ) {pr_debug ("%s: perf_evlist__new\n" , __func__);
@@ -48,13 +49,15 @@ int test__syscall_open_tp_fields(void) err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__open: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; } err =perf_evlist__mmap (evlist,UINT_MAX , false);if (err <0 ) { -pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__mmap: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/open-syscall.c +2 -1
@@ -9,6 +9,7 @@ int test__open_syscall_event(void)struct perf_evsel *evsel;unsigned int nr_open_calls =111 , i;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +char sbuf[STRERR_BUFSIZE ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -24,7 +25,7 @@ int test__open_syscall_event(void)if (perf_evsel__open_per_thread (evsel, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_evsel_delete; }
tools/perf/tests/perf-record.c +9 -4
@@ -59,6 +59,7 @@ int test__PERF_RECORD(void)int err =-1 , errs =0 , i, wakeups =0 ;u32 cpu;int total_events =0 , nr_events[PERF_RECORD_MAX ] = {0 , }; +char sbuf[STRERR_BUFSIZE ];if (evlist ==NULL || argv ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
@@ -100,7 +101,8 @@ int test__PERF_RECORD(void) err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);if (err <0 ) { -pr_debug ("sched__get_first_possible_cpu: %s\n" ,strerror (errno)); +pr_debug ("sched__get_first_possible_cpu: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -110,7 +112,8 @@ int test__PERF_RECORD(void)* So that we can check perf_sample.cpu on all the samples. */ if (sched_setaffinity (evlist->workload.pid, cpu_mask_size, &cpu_mask) <0 ) { -pr_debug ("sched_setaffinity: %s\n" ,strerror (errno)); +pr_debug ("sched_setaffinity: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -120,7 +123,8 @@ int test__PERF_RECORD(void)*/ err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__open: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -131,7 +135,8 @@ int test__PERF_RECORD(void)*/ err =perf_evlist__mmap (evlist, opts.mmap_pages, false);if (err <0 ) { -pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__mmap: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/rdpmc.c +4 -2
@@ -100,6 +100,7 @@ static int __test__rdpmc(void) };u64 delta_sum =0 ;struct sigaction sa; +char sbuf[STRERR_BUFSIZE ];sigfillset (&sa.sa_mask); sa.sa_sigaction = segfault_handler;
@@ -109,14 +110,15 @@ static int __test__rdpmc(void) perf_event_open_cloexec_flag());if (fd <0 ) {pr_err ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +"with %d (%s)\n" , fd, +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; } addr =mmap (NULL , page_size,PROT_READ ,MAP_SHARED , fd,0 );if (addr == (void *)(-1 )) {pr_err ("Error: mmap() syscall returned with (%s)\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_close; }
tools/perf/tests/sw-clock.c +4 -2
@@ -22,6 +22,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)volatile int tmp =0 ;u64 total_periods =0 ;int nr_samples =0 ; +char sbuf[STRERR_BUFSIZE ];union perf_event *event;struct perf_evsel *evsel;struct perf_evlist *evlist;
@@ -62,14 +63,15 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) err = -errno;pr_debug ("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64" in this test.\n" , -strerror (errno), knob, (u64 )attr.sample_freq); +strerror_r (errno, sbuf,sizeof (sbuf)), + knob, (u64 )attr.sample_freq); goto out_delete_evlist; } err =perf_evlist__mmap (evlist,128 , true);if (err <0 ) {pr_debug ("failed to mmap event: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/task-exit.c +4 -2
@@ -42,6 +42,7 @@ int test__task_exit(void) .uses_mmap = true, };const char *argv[] = {"true" ,NULL }; +char sbuf[STRERR_BUFSIZE ];signal (SIGCHLD , sig_handler);
@@ -82,13 +83,14 @@ int test__task_exit(void) err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("Couldn't open the evlist: %s\n" ,strerror (-err)); +pr_debug ("Couldn't open the evlist: %s\n" , +strerror_r (-err, sbuf,sizeof (sbuf))); goto out_delete_evlist; }if (perf_evlist__mmap (evlist,128 , true) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf test: Use strerror_r instead of strerror
perf test: Use strerror_r instead of strerror
Commit-ID: ba3dfff8ad2d98df0c8116faaeb281c93e161636 Gitweb: http://git.kernel.org/tip/ba3dfff8ad2d98df0c8116faaeb281c93e161636 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:45 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:07:28 -0300
perf test: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/tests/builtin-test.c | 4 +++- tools/perf/tests/mmap-basic.c | 7 ++++--- tools/perf/tests/open-syscall-all-cpus.c | 5 +++-- tools/perf/tests/open-syscall-tp-fields.c | 7 +++++-- tools/perf/tests/open-syscall.c | 3 ++- tools/perf/tests/perf-record.c | 13 +++++++++---- tools/perf/tests/rdpmc.c | 6 ++++-- tools/perf/tests/sw-clock.c | 6 ++++-- tools/perf/tests/task-exit.c | 6 ++++-- 9 files changed, 38 insertions(+), 19 deletions(-)
tools/perf/tests/builtin-test.c +3 -1
@@ -185,9 +185,11 @@ static bool perf_test__matches(int curr, int argc, const char *argv[])static int run_test (struct test *test) {int status, err =-1 , child =fork (); +char sbuf[STRERR_BUFSIZE ];if (child <0 ) { -pr_err ("failed to fork test: %s\n" ,strerror (errno)); +pr_err ("failed to fork test: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; }
tools/perf/tests/mmap-basic.c +4 -3
@@ -31,6 +31,7 @@ int test__basic_mmap(void)unsigned int nr_events[nsyscalls], expected_nr_events[nsyscalls], i, j;struct perf_evsel *evsels[nsyscalls], *evsel; +char sbuf[STRERR_BUFSIZE ]; threads =thread_map__new (-1 ,getpid (),UINT_MAX );if (threads ==NULL ) {
@@ -49,7 +50,7 @@ int test__basic_mmap(void)sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set);if (sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set) <0 ) {pr_debug ("sched_setaffinity() failed on CPU %d: %s " , - cpus->map[0 ],strerror (errno)); + cpus->map[0 ],strerror_r (errno, sbuf,sizeof (sbuf))); goto out_free_cpus; }
@@ -79,7 +80,7 @@ int test__basic_mmap(void)if (perf_evsel__open (evsels[i], cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -89,7 +90,7 @@ int test__basic_mmap(void)if (perf_evlist__mmap (evlist,128 , true) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/open-syscall-all-cpus.c +3 -2
@@ -12,6 +12,7 @@ int test__open_syscall_event_on_all_cpus(void)unsigned int nr_open_calls =111 , i;cpu_set_t cpu_set;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +char sbuf[STRERR_BUFSIZE ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -35,7 +36,7 @@ int test__open_syscall_event_on_all_cpus(void)if (perf_evsel__open (evsel, cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_evsel_delete; }
@@ -56,7 +57,7 @@ int test__open_syscall_event_on_all_cpus(void)if (sched_setaffinity (0 ,sizeof (cpu_set), &cpu_set) <0 ) {pr_debug ("sched_setaffinity() failed on CPU %d: %s " , cpus->map[cpu], -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_close_fd; }for (i =0 ; i < ncalls; ++i) {
tools/perf/tests/open-syscall-tp-fields.c +5 -2
@@ -22,6 +22,7 @@ int test__syscall_open_tp_fields(void)struct perf_evlist *evlist =perf_evlist__new ();struct perf_evsel *evsel;int err =-1 , i, nr_events =0 , nr_polls =0 ; +char sbuf[STRERR_BUFSIZE ];if (evlist ==NULL ) {pr_debug ("%s: perf_evlist__new\n" , __func__);
@@ -48,13 +49,15 @@ int test__syscall_open_tp_fields(void) err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__open: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; } err =perf_evlist__mmap (evlist,UINT_MAX , false);if (err <0 ) { -pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__mmap: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/open-syscall.c +2 -1
@@ -9,6 +9,7 @@ int test__open_syscall_event(void)struct perf_evsel *evsel;unsigned int nr_open_calls =111 , i;struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +char sbuf[STRERR_BUFSIZE ];if (threads ==NULL ) {pr_debug ("thread_map__new\n" );
@@ -24,7 +25,7 @@ int test__open_syscall_event(void)if (perf_evsel__open_per_thread (evsel, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_evsel_delete; }
tools/perf/tests/perf-record.c +9 -4
@@ -59,6 +59,7 @@ int test__PERF_RECORD(void)int err =-1 , errs =0 , i, wakeups =0 ;u32 cpu;int total_events =0 , nr_events[PERF_RECORD_MAX ] = {0 , }; +char sbuf[STRERR_BUFSIZE ];if (evlist ==NULL || argv ==NULL ) {pr_debug ("Not enough memory to create evlist\n" );
@@ -100,7 +101,8 @@ int test__PERF_RECORD(void) err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);if (err <0 ) { -pr_debug ("sched__get_first_possible_cpu: %s\n" ,strerror (errno)); +pr_debug ("sched__get_first_possible_cpu: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -110,7 +112,8 @@ int test__PERF_RECORD(void)* So that we can check perf_sample.cpu on all the samples. */ if (sched_setaffinity (evlist->workload.pid, cpu_mask_size, &cpu_mask) <0 ) { -pr_debug ("sched_setaffinity: %s\n" ,strerror (errno)); +pr_debug ("sched_setaffinity: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -120,7 +123,8 @@ int test__PERF_RECORD(void)*/ err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__open: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
@@ -131,7 +135,8 @@ int test__PERF_RECORD(void)*/ err =perf_evlist__mmap (evlist, opts.mmap_pages, false);if (err <0 ) { -pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); +pr_debug ("perf_evlist__mmap: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/rdpmc.c +4 -2
@@ -100,6 +100,7 @@ static int __test__rdpmc(void) };u64 delta_sum =0 ;struct sigaction sa; +char sbuf[STRERR_BUFSIZE ];sigfillset (&sa.sa_mask); sa.sa_sigaction = segfault_handler;
@@ -109,14 +110,15 @@ static int __test__rdpmc(void) perf_event_open_cloexec_flag());if (fd <0 ) {pr_err ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +"with %d (%s)\n" , fd, +strerror_r (errno, sbuf,sizeof (sbuf)));return -1 ; } addr =mmap (NULL , page_size,PROT_READ ,MAP_SHARED , fd,0 );if (addr == (void *)(-1 )) {pr_err ("Error: mmap() syscall returned with (%s)\n" , -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_close; }
tools/perf/tests/sw-clock.c +4 -2
@@ -22,6 +22,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)volatile int tmp =0 ;u64 total_periods =0 ;int nr_samples =0 ; +char sbuf[STRERR_BUFSIZE ];union perf_event *event;struct perf_evsel *evsel;struct perf_evlist *evlist;
@@ -62,14 +63,15 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) err = -errno;pr_debug ("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64" in this test.\n" , -strerror (errno), knob, (u64 )attr.sample_freq); +strerror_r (errno, sbuf,sizeof (sbuf)), + knob, (u64 )attr.sample_freq); goto out_delete_evlist; } err =perf_evlist__mmap (evlist,128 , true);if (err <0 ) {pr_debug ("failed to mmap event: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
tools/perf/tests/task-exit.c +4 -2
@@ -42,6 +42,7 @@ int test__task_exit(void) .uses_mmap = true, };const char *argv[] = {"true" ,NULL }; +char sbuf[STRERR_BUFSIZE ];signal (SIGCHLD , sig_handler);
@@ -82,13 +83,14 @@ int test__task_exit(void) err =perf_evlist__open (evlist);if (err <0 ) { -pr_debug ("Couldn't open the evlist: %s\n" ,strerror (-err)); +pr_debug ("Couldn't open the evlist: %s\n" , +strerror_r (-err, sbuf,sizeof (sbuf))); goto out_delete_evlist; }if (perf_evlist__mmap (evlist,128 , true) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, sbuf,sizeof (sbuf))); goto out_delete_evlist; }
PATCH 9/13 perf sched: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-sched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-sched.c +3 -1
@@ -428,6 +428,7 @@ static u64 get_cpu_usage_nsec_parent(void)static int self_open_counters (void ) {struct perf_event_attr attr; +char sbuf[STRERR_BUFSIZE ];int fd;memset (&attr,0 ,sizeof (attr));
@@ -440,7 +441,8 @@ static int self_open_counters(void)if (fd <0 )pr_err ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +"with %d (%s)\n" , fd, +strerror_r (errno, sbuf,sizeof (sbuf)));return fd; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf sched: Use strerror_r instead of strerror
perf sched: Use strerror_r instead of strerror
Commit-ID: fb74fbda42dc5bcbd9bae5d75bfb6755948db21d Gitweb: http://git.kernel.org/tip/fb74fbda42dc5bcbd9bae5d75bfb6755948db21d Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:47 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:07:47 -0300
perf sched: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-sched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-sched.c +3 -1
@@ -428,6 +428,7 @@ static u64 get_cpu_usage_nsec_parent(void)static int self_open_counters (void ) {struct perf_event_attr attr; +char sbuf[STRERR_BUFSIZE ];int fd;memset (&attr,0 ,sizeof (attr));
@@ -440,7 +441,8 @@ static int self_open_counters(void)if (fd <0 )pr_err ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +"with %d (%s)\n" , fd, +strerror_r (errno, sbuf,sizeof (sbuf)));return fd; }
PATCH 10/13 perf buildid-cache: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-buildid-cache.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/builtin-buildid-cache.c +4 -3
@@ -291,6 +291,7 @@ int cmd_buildid_cache(int argc, const char **argv, *missing_filename =NULL , *update_name_list_str =NULL , *kcore_filename; +char sbuf[STRERR_BUFSIZE ];struct perf_data_file file = { .mode =PERF_DATA_MODE_READ ,
@@ -347,7 +348,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't add %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
@@ -365,7 +366,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't remove %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
@@ -386,7 +387,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't update %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf buildid-cache: Use strerror_r instead of strerror
perf buildid-cache: Use strerror_r instead of strerror
Commit-ID: 340481ada1af9322d99e9c1ba874391f53ff4fce Gitweb: http://git.kernel.org/tip/340481ada1af9322d99e9c1ba874391f53ff4fce Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:49 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:07:59 -0300
perf buildid-cache: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-buildid-cache.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/builtin-buildid-cache.c +4 -3
@@ -291,6 +291,7 @@ int cmd_buildid_cache(int argc, const char **argv, *missing_filename =NULL , *update_name_list_str =NULL , *kcore_filename; +char sbuf[STRERR_BUFSIZE ];struct perf_data_file file = { .mode =PERF_DATA_MODE_READ ,
@@ -347,7 +348,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't add %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
@@ -365,7 +366,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't remove %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
@@ -386,7 +387,7 @@ int cmd_buildid_cache(int argc, const char **argv,continue ; }pr_warning ("Couldn't update %s: %s\n" , - pos->s,strerror (errno)); + pos->s,strerror_r (errno, sbuf,sizeof (sbuf))); }strlist__delete (list);
PATCH 11/13 perf kvm: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/builtin-kvm.c +5 -2
@@ -990,6 +990,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)int err, rc =-1 ;struct perf_evsel *pos;struct perf_evlist *evlist = kvm->evlist; +char sbuf[STRERR_BUFSIZE ];perf_evlist__config (evlist, &kvm->opts);
@@ -1026,12 +1027,14 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) err =perf_evlist__open (evlist);if (err <0 ) { -printf ("Couldn't create the events: %s\n" ,strerror (errno)); +printf ("Couldn't create the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out; }if (perf_evlist__mmap (evlist, kvm->opts.mmap_pages, false) <0 ) { -ui__error ("Failed to mmap the events: %s\n" ,strerror (errno)); +ui__error ("Failed to mmap the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));perf_evlist__close (evlist); goto out; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf kvm: Use strerror_r instead of strerror
perf kvm: Use strerror_r instead of strerror
Commit-ID: f9f33fdba159a9c163ecf1dc0106ebd4c2498130 Gitweb: http://git.kernel.org/tip/f9f33fdba159a9c163ecf1dc0106ebd4c2498130 Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:51 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:08:14 -0300
perf kvm: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/builtin-kvm.c +5 -2
@@ -990,6 +990,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)int err, rc =-1 ;struct perf_evsel *pos;struct perf_evlist *evlist = kvm->evlist; +char sbuf[STRERR_BUFSIZE ];perf_evlist__config (evlist, &kvm->opts);
@@ -1026,12 +1027,14 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) err =perf_evlist__open (evlist);if (err <0 ) { -printf ("Couldn't create the events: %s\n" ,strerror (errno)); +printf ("Couldn't create the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf))); goto out; }if (perf_evlist__mmap (evlist, kvm->opts.mmap_pages, false) <0 ) { -ui__error ("Failed to mmap the events: %s\n" ,strerror (errno)); +ui__error ("Failed to mmap the events: %s\n" , +strerror_r (errno, sbuf,sizeof (sbuf)));perf_evlist__close (evlist); goto out; }
PATCH 12/13 perf help: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-help.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tools/perf/builtin-help.c +16 -4
@@ -103,6 +103,8 @@ static int check_emacsclient_version(void)static void exec_woman_emacs (const char *path,const char *page) { +char sbuf[STRERR_BUFSIZE ]; +if (!check_emacsclient_version ()) {/* This works only with emacsclient version >= 22. */ struct strbuf man_page =STRBUF_INIT ;
@@ -111,16 +113,19 @@ static void exec_woman_emacs(const char *path, const char *page) path ="emacsclient" ;strbuf_addf (&man_page,"(woman \"%s\")" , page);execlp (path,"emacsclient" ,"-e" , man_page.buf,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); } }static void exec_man_konqueror (const char *path,const char *page) {const char *display =getenv ("DISPLAY" ); +if (display && *display) {struct strbuf man_page =STRBUF_INIT ;const char *filename ="kfmclient" ; +char sbuf[STRERR_BUFSIZE ];/* It's simpler to launch konqueror using kfmclient. */ if (path) {
@@ -139,24 +144,31 @@ static void exec_man_konqueror(const char *path, const char *page) path ="kfmclient" ;strbuf_addf (&man_page,"man:%s(1)" , page);execlp (path, filename,"newTab" , man_page.buf,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); } }static void exec_man_man (const char *path,const char *page) { +char sbuf[STRERR_BUFSIZE ]; +if (!path) path ="man" ;execlp (path,"man" , page,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); }static void exec_man_cmd (const char *cmd,const char *page) {struct strbuf shell_cmd =STRBUF_INIT ; +char sbuf[STRERR_BUFSIZE ]; +strbuf_addf (&shell_cmd,"%s %s" , cmd, page);execl ("/bin/sh" ,"sh" ,"-c" , shell_cmd.buf,NULL ); -warning ("failed to exec '%s': %s" , cmd,strerror (errno)); +warning ("failed to exec '%s': %s" , cmd, +strerror_r (errno, sbuf,sizeof (sbuf))); }static void add_man_viewer (const char *name)
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf help: Use strerror_r instead of strerror
perf help: Use strerror_r instead of strerror
Commit-ID: ede395d27c60c06a2173e7a9c0f4a929a1fef73e Gitweb: http://git.kernel.org/tip/ede395d27c60c06a2173e7a9c0f4a929a1fef73e Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:53 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:08:26 -0300
perf help: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error messages for thread-safety.
--- tools/perf/builtin-help.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tools/perf/builtin-help.c +16 -4
@@ -103,6 +103,8 @@ static int check_emacsclient_version(void)static void exec_woman_emacs (const char *path,const char *page) { +char sbuf[STRERR_BUFSIZE ]; +if (!check_emacsclient_version ()) {/* This works only with emacsclient version >= 22. */ struct strbuf man_page =STRBUF_INIT ;
@@ -111,16 +113,19 @@ static void exec_woman_emacs(const char *path, const char *page) path ="emacsclient" ;strbuf_addf (&man_page,"(woman \"%s\")" , page);execlp (path,"emacsclient" ,"-e" , man_page.buf,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); } }static void exec_man_konqueror (const char *path,const char *page) {const char *display =getenv ("DISPLAY" ); +if (display && *display) {struct strbuf man_page =STRBUF_INIT ;const char *filename ="kfmclient" ; +char sbuf[STRERR_BUFSIZE ];/* It's simpler to launch konqueror using kfmclient. */ if (path) {
@@ -139,24 +144,31 @@ static void exec_man_konqueror(const char *path, const char *page) path ="kfmclient" ;strbuf_addf (&man_page,"man:%s(1)" , page);execlp (path, filename,"newTab" , man_page.buf,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); } }static void exec_man_man (const char *path,const char *page) { +char sbuf[STRERR_BUFSIZE ]; +if (!path) path ="man" ;execlp (path,"man" , page,NULL ); -warning ("failed to exec '%s': %s" , path,strerror (errno)); +warning ("failed to exec '%s': %s" , path, +strerror_r (errno, sbuf,sizeof (sbuf))); }static void exec_man_cmd (const char *cmd,const char *page) {struct strbuf shell_cmd =STRBUF_INIT ; +char sbuf[STRERR_BUFSIZE ]; +strbuf_addf (&shell_cmd,"%s %s" , cmd, page);execl ("/bin/sh" ,"sh" ,"-c" , shell_cmd.buf,NULL ); -warning ("failed to exec '%s': %s" , cmd,strerror (errno)); +warning ("failed to exec '%s': %s" , cmd, +strerror_r (errno, sbuf,sizeof (sbuf))); }static void add_man_viewer (const char *name)
PATCH 13/13 perf stat: Use strerror_r instead of strerror
In reply to Masami HiramatsuUse strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-stat.c +1 -1
@@ -593,7 +593,7 @@ static int __run_perf_stat(int argc, const char **argv)if (perf_evlist__apply_filters (evsel_list)) {error ("failed to set filter with %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, msg,sizeof (msg)));return -1 ; }
tip-bot for Masami Hiramatsu
merge bot[tip:perf/core] perf stat: Use strerror_r instead of strerror
perf stat: Use strerror_r instead of strerror
Commit-ID: 759e612bf96627b64fcafe4174b3f6f2dedf2c0d Gitweb: http://git.kernel.org/tip/759e612bf96627b64fcafe4174b3f6f2dedf2c0d Author: Masami Hiramatsu <[email protected]> AuthorDate: Thu, 14 Aug 2014 02:22:55 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Aug 2014 13:08:40 -0300
perf stat: Use strerror_r instead of strerror
Use strerror_r instead of strerror in error message for thread-safety.
--- tools/perf/builtin-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-stat.c +1 -1
@@ -593,7 +593,7 @@ static int __run_perf_stat(int argc, const char **argv)if (perf_evlist__apply_filters (evsel_list)) {error ("failed to set filter with %d (%s)\n" , errno, -strerror (errno)); +strerror_r (errno, msg,sizeof (msg)));return -1 ; }