perf tools: convert to asprintf()
PATCH 1/2 perf tools: convert to asprintf()
The following snippet
V = malloc(S);
if (!V) { }
sprintf(V, ...)
conuld be easily changed to a one line:
if (asprintf(&V, ...) < 0) { }Signed-off-by Andy Shevchenko <[email protected]>
--- tools/perf/util/trace-event-info.c | 12 +++--------- tools/perf/util/util.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-)
tools/perf/util/trace-event-info.c +3 -9
@@ -191,12 +191,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)strcmp (dent->d_name,".." ) ==0 || !name_in_tp_list(dent->d_name, tps)) continue; - format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); -if (!format) { +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);free (format);if (ret <0 )
@@ -217,12 +215,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)strcmp (dent->d_name,".." ) ==0 || !name_in_tp_list(dent->d_name, tps)) continue; - format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); -if (!format) { +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);if (ret >=0 ) {
@@ -317,12 +313,10 @@ static int record_event_files(struct tracepoint_path *tps)strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list(dent->d_name, tps)) continue; - sys =malloc (strlen (path) +strlen (dent->d_name) +2 ); -if (!sys) { +if (asprintf (&sys,"%s/%s" , path, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) {ssize_t size =strlen (dent->d_name) +1 ;
tools/perf/util/util.c +2 -7
@@ -333,12 +333,9 @@ const char *find_tracing_dir(void)if (!debugfs)return NULL ; - tracing =malloc (strlen (debugfs) +9 ); -if (!tracing) +if (asprintf (&tracing,"%s/tracing" , debugfs) <0 )return NULL ; -sprintf (tracing,"%s/tracing" , debugfs); - tracing_found =1 ;return tracing; }
@@ -352,11 +349,9 @@ char *get_tracing_file(const char *name)if (!tracing)return NULL ; - file =malloc (strlen (tracing) +strlen (name) +2 ); -if (!file) +if (asprintf (&file,"%s/%s" , tracing, name) <0 )return NULL ; -sprintf (file,"%s/%s" , tracing, name);return file; }
Signature · 1 line
2.0.1
PATCH 2/2 perf tools: substitute yet another strtoull()
Instead of home grown function let's use what library provides us.
Signed-off-by Andy Shevchenko <[email protected]>
--- tools/perf/util/util.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)
tools/perf/util/util.c +2 -22
@@ -206,35 +206,15 @@ size_t hex_width(u64 v)return n; } -static int hex (char ch) -{ -if ((ch >='0' ) && (ch <='9' )) -return ch -'0' ; -if ((ch >='a' ) && (ch <='f' )) -return ch -'a' +10 ; -if ((ch >='A' ) && (ch <='F' )) -return ch -'A' +10 ; -return -1 ; -} -/* * While we find nice hex chars, build a long_val. * Return number of chars processed. */ int hex2u64 (const char *ptr,u64 *long_val) { -const char *p = ptr; - *long_val =0 ; - -while (*p) { -const int hex_val =hex (*p); +char *p; -if (hex_val <0 ) -break ; - - *long_val = (*long_val <<4 ) | hex_val; - p++; - } + *long_val =strtoull (ptr, &p,16 );return p - ptr; }
Signature · 1 line
2.0.1
Re: [PATCH 2/2] perf tools: substitute yet another strtoull()
Quoted 2 lines · Andy Shevchenko
Instead of home grown function let's use what library provides us.
Any comments on this? Should I resend it?
Quoted 47 lines
Signed-off-by Andy Shevchenko <[email protected]>--- tools/perf/util/util.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)tools/perf/util/util.c +2
-22@@ -206,35 +206,15 @@ size_t hex_width(u64 v)return n; } -static int hex (char ch) -{ -if ((ch >='0' ) && (ch <='9' )) -return ch -'0' ; -if ((ch >='a' ) && (ch <='f' )) -return ch -'a' +10 ; -if ((ch >='A' ) && (ch <='F' )) -return ch -'A' +10 ; -return -1 ; -} -/* * While we find nice hex chars, build a long_val. * Return number of chars processed. */ int hex2u64 (const char *ptr,u64 *long_val) { -const char *p = ptr; - *long_val =0 ; - -while (*p) { -const int hex_val =hex (*p); +char *p; -if (hex_val <0 ) -break ; - - *long_val = (*long_val <<4 ) | hex_val; - p++; - } + *long_val =strtoull (ptr, &p,16 );return p - ptr; }
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
tip-bot for Andy Shevchenko
merge bot[tip:perf/core] perf tools: Convert open coded equivalents to asprintf()
In reply to Andy Shevchenkoperf tools: Convert open coded equivalents to asprintf()
Commit-ID: d400a68d1f1e7a1fc7c5caf9024d4e67b218558d Gitweb: http://git.kernel.org/tip/d400a68d1f1e7a1fc7c5caf9024d4e67b218558d Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 4 Jul 2014 14:43:48 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 7 Jul 2014 16:55:24 -0300
perf tools: Convert open coded equivalents to asprintf()
The following snippet
V = malloc(S);
if (!V) { }
sprintf(V, ...)Can be easily changed to a one line:
if (asprintf(&V, ...) < 0) { }Signed-off-by Andy Shevchenko <[email protected]>
Cc Adrian Hunter <[email protected]>
Link http://lkml.kernel.org/r/1404474229-15272-1-git-send-email-andriy.shevchenko@linux.intel.com open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/trace-event-info.c | 12 +++--------- tools/perf/util/util.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-)
tools/perf/util/trace-event-info.c +3 -9
@@ -191,12 +191,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)strcmp (dent->d_name,".." ) ==0 || !name_in_tp_list(dent->d_name, tps)) continue; - format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); -if (!format) { +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);free (format);if (ret <0 )
@@ -217,12 +215,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)strcmp (dent->d_name,".." ) ==0 || !name_in_tp_list(dent->d_name, tps)) continue; - format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); -if (!format) { +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);if (ret >=0 ) {
@@ -317,12 +313,10 @@ static int record_event_files(struct tracepoint_path *tps)strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list(dent->d_name, tps)) continue; - sys =malloc (strlen (path) +strlen (dent->d_name) +2 ); -if (!sys) { +if (asprintf (&sys,"%s/%s" , path, dent->d_name) <0 ) { err = -ENOMEM ; goto out; } -sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) {ssize_t size =strlen (dent->d_name) +1 ;
tools/perf/util/util.c +2 -7
@@ -333,12 +333,9 @@ const char *find_tracing_dir(void)if (!debugfs)return NULL ; - tracing =malloc (strlen (debugfs) +9 ); -if (!tracing) +if (asprintf (&tracing,"%s/tracing" , debugfs) <0 )return NULL ; -sprintf (tracing,"%s/tracing" , debugfs); - tracing_found =1 ;return tracing; }
@@ -352,11 +349,9 @@ char *get_tracing_file(const char *name)if (!tracing)return NULL ; - file =malloc (strlen (tracing) +strlen (name) +2 ); -if (!file) +if (asprintf (&file,"%s/%s" , tracing, name) <0 )return NULL ; -sprintf (file,"%s/%s" , tracing, name);return file; }