perf util: Cleanup die() and its friends (v2)
Namhyung Kim
maintainercover perf util: Cleanup die() and its friends (v2)
Hi,
I updated this series with previous feedbacks from Steven, Peter and Arnaldo. Thanks for all your comments.
* v2 changes
- fix a grammar in an error message
- change some pr_err() -> pr_debug()
- use kernel error checking style consistently
Namhyung Kim (9):
perf util: Let get_tracing_file() can return NULL perf util: Get rid of malloc_or_die() in trace-event-info.c perf util: Get rid of write_or_die() from trace-event-info.c perf util: Get rid of die() calls from trace-event-info.c perf util: Handle failure case in trace_report() perf util: Get rid of malloc_or_die() in trace-event-read.c perf util: Get rid of read_or_die() in trace-event-read.c perf util: Get rid of die() calls in trace-data-read.c perf util: Cleanup calc_data_size logic
tools/perf/util/header.c | 9 +- tools/perf/util/trace-event-info.c | 347 +++++++++++++++++++++++++------------ tools/perf/util/trace-event-read.c | 270 +++++++++++++++++++---------- tools/perf/util/trace-event.h | 2 +- 4 files changed, 425 insertions(+), 203 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/9 perf util: Let get_tracing_file() can return NULL
From: Namhyung Kim <[email protected]>
So that it can be used by other places.
--- tools/perf/util/trace-event-info.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/trace-event-info.c +22 -3
@@ -62,7 +62,7 @@ static const char *find_debugfs(void)const char *path =perf_debugfs_mount (NULL );if (!path) -die ("Your kernel not support debugfs filesystem" ); +pr_debug ("Your kernel does not support the debugfs filesystem" );return path; }
@@ -81,8 +81,12 @@ static const char *find_tracing_dir(void)return tracing; debugfs =find_debugfs (); +if (!debugfs) +return NULL ; - tracing =malloc_or_die (strlen (debugfs) +9 ); + tracing =malloc (strlen (debugfs) +9 ); +if (!tracing) +return NULL ;sprintf (tracing,"%s/tracing" , debugfs);
@@ -99,7 +103,9 @@ static char *get_tracing_file(const char *name)if (!tracing)return NULL ; - file =malloc_or_die (strlen (tracing) +strlen (name) +2 ); + file =malloc (strlen (tracing) +strlen (name) +2 ); +if (!file) +return NULL ;sprintf (file,"%s/%s" , tracing, name);return file;
@@ -170,6 +176,9 @@ static void read_header_files(void)struct stat st; path =get_tracing_file ("events/header_page" ); +if (!path) +die ("can't get tracing/events/header_page" ); +if (stat (path, &st) <0 )die ("can't read '%s'" , path);
@@ -178,6 +187,9 @@ static void read_header_files(void)put_tracing_file (path); path =get_tracing_file ("events/header_event" ); +if (!path) +die ("can't get tracing/events/header_event" ); +if (stat (path, &st) <0 )die ("can't read '%s'" , path);
@@ -251,6 +263,8 @@ static void read_ftrace_files(struct tracepoint_path *tps)char *path; path =get_tracing_file ("events/ftrace" ); +if (!path) +die ("can't get tracing/events/ftrace" );copy_event_system (path, tps);
@@ -279,6 +293,8 @@ static void read_event_files(struct tracepoint_path *tps)int ret; path =get_tracing_file ("events" ); +if (!path) +die ("can't get tracing/events" ); dir =opendir (path);if (!dir)
@@ -343,6 +359,9 @@ static void read_ftrace_printk(void)int ret; path =get_tracing_file ("printk_formats" ); +if (!path) +die ("can't get tracing/printk_formats" ); + ret =stat (path, &st);if (ret <0 ) {/* not found */
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Let get_tracing_file() return NULL to indicate failure.
perf tools: Let get_tracing_file() return NULL to indicate failure.
Commit-ID: 454f8c7d26fa7e1545df4efca5d9ba929ccef1e8 Gitweb: http://git.kernel.org/tip/454f8c7d26fa7e1545df4efca5d9ba929ccef1e8 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:44 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:09:42 -0300
perf tools: Let get_tracing_file() return NULL to indicate failure.
So that it can be used by other places.
--- tools/perf/util/trace-event-info.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/trace-event-info.c +22 -3
@@ -62,7 +62,7 @@ static const char *find_debugfs(void)const char *path =perf_debugfs_mount (NULL );if (!path) -die ("Your kernel not support debugfs filesystem" ); +pr_debug ("Your kernel does not support the debugfs filesystem" );return path; }
@@ -81,8 +81,12 @@ static const char *find_tracing_dir(void)return tracing; debugfs =find_debugfs (); +if (!debugfs) +return NULL ; - tracing =malloc_or_die (strlen (debugfs) +9 ); + tracing =malloc (strlen (debugfs) +9 ); +if (!tracing) +return NULL ;sprintf (tracing,"%s/tracing" , debugfs);
@@ -99,7 +103,9 @@ static char *get_tracing_file(const char *name)if (!tracing)return NULL ; - file =malloc_or_die (strlen (tracing) +strlen (name) +2 ); + file =malloc (strlen (tracing) +strlen (name) +2 ); +if (!file) +return NULL ;sprintf (file,"%s/%s" , tracing, name);return file;
@@ -170,6 +176,9 @@ static void read_header_files(void)struct stat st; path =get_tracing_file ("events/header_page" ); +if (!path) +die ("can't get tracing/events/header_page" ); +if (stat (path, &st) <0 )die ("can't read '%s'" , path);
@@ -178,6 +187,9 @@ static void read_header_files(void)put_tracing_file (path); path =get_tracing_file ("events/header_event" ); +if (!path) +die ("can't get tracing/events/header_event" ); +if (stat (path, &st) <0 )die ("can't read '%s'" , path);
@@ -251,6 +263,8 @@ static void read_ftrace_files(struct tracepoint_path *tps)char *path; path =get_tracing_file ("events/ftrace" ); +if (!path) +die ("can't get tracing/events/ftrace" );copy_event_system (path, tps);
@@ -279,6 +293,8 @@ static void read_event_files(struct tracepoint_path *tps)int ret; path =get_tracing_file ("events" ); +if (!path) +die ("can't get tracing/events" ); dir =opendir (path);if (!dir)
@@ -343,6 +359,9 @@ static void read_ftrace_printk(void)int ret; path =get_tracing_file ("printk_formats" ); +if (!path) +die ("can't get tracing/printk_formats" ); + ret =stat (path, &st);if (ret <0 ) {/* not found */
Namhyung Kim
maintainerPATCH 2/9 perf util: Get rid of malloc_or_die() in trace-event-info.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Check return value of malloc and fail if NULL.
--- tools/perf/util/trace-event-info.c | 48 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-)
tools/perf/util/trace-event-info.c +30 -18
@@ -47,16 +47,6 @@ static const char *output_file = "trace.info";static int output_fd; -static void *malloc_or_die (unsigned int size) -{ -void *data; - - data =malloc (size); -if (!data) -die ("malloc" ); -return data; -} -static const char *find_debugfs (void ) {const char *path =perf_debugfs_mount (NULL );
@@ -209,7 +199,7 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)return false; } -static void copy_event_system (const char *sys,struct tracepoint_path *tps) +static int copy_event_system (const char *sys,struct tracepoint_path *tps) {struct dirent *dent;struct stat st;
@@ -217,6 +207,7 @@ static void copy_event_system(const char *sys, struct tracepoint_path *tps)DIR *dir;int count =0 ;int ret; +int err; dir =opendir (sys);if (!dir)
@@ -228,7 +219,11 @@ static void 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_or_die (strlen (sys) +strlen (dent->d_name) +10 ); + format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); +if (!format) { + err = -ENOMEM ; + goto out; + }sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);free (format);
@@ -246,16 +241,22 @@ static void 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_or_die (strlen (sys) +strlen (dent->d_name) +10 ); + format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); +if (!format) { + err = -ENOMEM ; + goto out; + }sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);if (ret >=0 )record_file (format,8 ); -free (format); } + err =0 ; +out:closedir (dir); +return err; }static void read_ftrace_files (struct tracepoint_path *tps)
@@ -282,7 +283,7 @@ static bool system_in_tp_list(char *sys, struct tracepoint_path *tps)return false; } -static void read_event_files (struct tracepoint_path *tps) +static int read_event_files (struct tracepoint_path *tps) {struct dirent *dent;struct stat st;
@@ -291,6 +292,7 @@ static void read_event_files(struct tracepoint_path *tps)DIR *dir;int count =0 ;int ret; +int err; path =get_tracing_file ("events" );if (!path)
@@ -320,7 +322,11 @@ static void read_event_files(struct tracepoint_path *tps)strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list(dent->d_name, tps)) continue; - sys =malloc_or_die (strlen (path) +strlen (dent->d_name) +2 ); + sys =malloc (strlen (path) +strlen (dent->d_name) +2 ); +if (!sys) { + err = -ENOMEM ; + goto out; + }sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) {
@@ -329,9 +335,12 @@ static void read_event_files(struct tracepoint_path *tps) }free (sys); } - + err =0 ; +out:closedir (dir);put_tracing_file (path); + +return err; }static void read_proc_kallsyms (void )
@@ -463,7 +472,10 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,if (!tps)return NULL ; - tdata =malloc_or_die (sizeof (*tdata)); + tdata =malloc (sizeof (*tdata)); +if (!tdata) +return NULL ; + tdata->temp = temp; tdata->size =0 ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of malloc_or_die() in trace-event-info.c
perf tools: Get rid of malloc_or_die() in trace-event-info.c
Commit-ID: 5a6fd27ad73fef0ed39a00236acbc3a17834672a Gitweb: http://git.kernel.org/tip/5a6fd27ad73fef0ed39a00236acbc3a17834672a Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:45 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:12:28 -0300
perf tools: Get rid of malloc_or_die() in trace-event-info.c
Check return value of malloc and fail if NULL.
--- tools/perf/util/trace-event-info.c | 48 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-)
tools/perf/util/trace-event-info.c +30 -18
@@ -47,16 +47,6 @@ static const char *output_file = "trace.info";static int output_fd; -static void *malloc_or_die (unsigned int size) -{ -void *data; - - data =malloc (size); -if (!data) -die ("malloc" ); -return data; -} -static const char *find_debugfs (void ) {const char *path =perf_debugfs_mount (NULL );
@@ -209,7 +199,7 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)return false; } -static void copy_event_system (const char *sys,struct tracepoint_path *tps) +static int copy_event_system (const char *sys,struct tracepoint_path *tps) {struct dirent *dent;struct stat st;
@@ -217,6 +207,7 @@ static void copy_event_system(const char *sys, struct tracepoint_path *tps)DIR *dir;int count =0 ;int ret; +int err; dir =opendir (sys);if (!dir)
@@ -228,7 +219,11 @@ static void 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_or_die (strlen (sys) +strlen (dent->d_name) +10 ); + format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); +if (!format) { + err = -ENOMEM ; + goto out; + }sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);free (format);
@@ -246,16 +241,22 @@ static void 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_or_die (strlen (sys) +strlen (dent->d_name) +10 ); + format =malloc (strlen (sys) +strlen (dent->d_name) +10 ); +if (!format) { + err = -ENOMEM ; + goto out; + }sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st);if (ret >=0 )record_file (format,8 ); -free (format); } + err =0 ; +out:closedir (dir); +return err; }static void read_ftrace_files (struct tracepoint_path *tps)
@@ -282,7 +283,7 @@ static bool system_in_tp_list(char *sys, struct tracepoint_path *tps)return false; } -static void read_event_files (struct tracepoint_path *tps) +static int read_event_files (struct tracepoint_path *tps) {struct dirent *dent;struct stat st;
@@ -291,6 +292,7 @@ static void read_event_files(struct tracepoint_path *tps)DIR *dir;int count =0 ;int ret; +int err; path =get_tracing_file ("events" );if (!path)
@@ -320,7 +322,11 @@ static void read_event_files(struct tracepoint_path *tps)strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list(dent->d_name, tps)) continue; - sys =malloc_or_die (strlen (path) +strlen (dent->d_name) +2 ); + sys =malloc (strlen (path) +strlen (dent->d_name) +2 ); +if (!sys) { + err = -ENOMEM ; + goto out; + }sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) {
@@ -329,9 +335,12 @@ static void read_event_files(struct tracepoint_path *tps) }free (sys); } - + err =0 ; +out:closedir (dir);put_tracing_file (path); + +return err; }static void read_proc_kallsyms (void )
@@ -463,7 +472,10 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,if (!tps)return NULL ; - tdata =malloc_or_die (sizeof (*tdata)); + tdata =malloc (sizeof (*tdata)); +if (!tdata) +return NULL ; + tdata->temp = temp; tdata->size =0 ;
Namhyung Kim
maintainerPATCH 3/9 perf util: Get rid of write_or_die() from trace-event-info.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Check return value of write and fail if error.
--- tools/perf/util/trace-event-info.c | 180 ++++++++++++++++++++++++++----------- tools/perf/util/trace-event.h | 2 +- 2 files changed, 127 insertions(+), 55 deletions(-)
tools/perf/util/trace-event-info.c +126 -54
@@ -106,17 +106,6 @@ static void put_tracing_file(char *file)free (file); } -static ssize_t write_or_die (const void *buf,size_t len) -{ -int ret; - - ret =write (output_fd, buf, len); -if (ret <0 ) -die ("writing to '%s'" , output_file); - -return ret; -} -int bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 ,0x0 ,0x0 ,0x0 ,0x0 };
@@ -127,29 +116,32 @@ int bigendian(void) }/* unfortunately, you can not stat debugfs or proc files for size */ -static void record_file (const char *file,size_t hdr_sz) +static int record_file (const char *file,ssize_t hdr_sz) {unsigned long long size =0 ;char buf[BUFSIZ ], *sizep;off_t hdr_pos =lseek (output_fd,0 ,SEEK_CUR );int r, fd; +int err = -EIO ; fd =open (file,O_RDONLY );if (fd <0 )die ("Can't read '%s'" , file);/* put in zeros for file size, then fill true size later */ -if (hdr_sz) -write_or_die (&size, hdr_sz); +if (hdr_sz) { +if (write (output_fd, &size, hdr_sz) != hdr_sz) + goto out; + }do { r =read (fd, buf,BUFSIZ );if (r >0 ) { size += r; -write_or_die (buf, r); +if (write (output_fd, buf, r) != r) + goto out; } }while (r >0 ); -close (fd);/* ugh, handle big-endian hdr_size == 4 */ sizep = (char *)&size;
@@ -158,12 +150,18 @@ static void record_file(const char *file, size_t hdr_sz)if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 )die ("writing to %s" , output_file); + + err =0 ; +out: +close (fd); +return err; } -static void read_header_files (void ) +static int read_header_files (void ) {char *path;struct stat st; +int err = -EIO ; path =get_tracing_file ("events/header_page" );if (!path)
@@ -172,8 +170,16 @@ static void read_header_files(void)if (stat (path, &st) <0 )die ("can't read '%s'" , path); -write_or_die ("header_page" ,12 ); -record_file (path,8 ); +if (write (output_fd,"header_page" ,12 ) !=12 ) { +pr_debug ("can't write header_page\n" ); + goto out; + } + +if (record_file (path,8 ) <0 ) { +pr_debug ("can't record header_page file\n" ); + goto out; + } +put_tracing_file (path); path =get_tracing_file ("events/header_event" );
@@ -183,9 +189,20 @@ static void read_header_files(void)if (stat (path, &st) <0 )die ("can't read '%s'" , path); -write_or_die ("header_event" ,13 ); -record_file (path,8 ); +if (write (output_fd,"header_event" ,13 ) !=13 ) { +pr_debug ("can't write header_event\n" ); + goto out; + } + +if (record_file (path,8 ) <0 ) { +pr_debug ("can't record header_event file\n" ); + goto out; + } + + err =0 ; +out:put_tracing_file (path); +return err; }static bool name_in_tp_list (char *sys,struct tracepoint_path *tps)
@@ -232,7 +249,11 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps) count++; } -write_or_die (&count,4 ); +if (write (output_fd, &count,4 ) !=4 ) { + err = -EIO ; +pr_debug ("can't write count\n" ); + goto out; + }rewinddir (dir);while ((dent =readdir (dir))) {
@@ -249,8 +270,13 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st); -if (ret >=0 ) -record_file (format,8 ); +if (ret >=0 ) { + err =record_file (format,8 ); +if (err) { +free (format); + goto out; + } + }free (format); } err =0 ;
@@ -259,17 +285,20 @@ out:return err; } -static void read_ftrace_files (struct tracepoint_path *tps) +static int read_ftrace_files (struct tracepoint_path *tps) {char *path; +int ret; path =get_tracing_file ("events/ftrace" );if (!path)die ("can't get tracing/events/ftrace" ); -copy_event_system (path, tps); + ret =copy_event_system (path, tps);put_tracing_file (path); + +return ret; }static bool system_in_tp_list (char *sys,struct tracepoint_path *tps)
@@ -312,7 +341,11 @@ static int read_event_files(struct tracepoint_path *tps) count++; } -write_or_die (&count,4 ); +if (write (output_fd, &count,4 ) !=4 ) { + err = -EIO ; +pr_debug ("can't write count\n" ); + goto out; + }rewinddir (dir);while ((dent =readdir (dir))) {
@@ -330,8 +363,14 @@ static int read_event_files(struct tracepoint_path *tps)sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) { -write_or_die (dent->d_name,strlen (dent->d_name) +1 ); -copy_event_system (sys, tps); +ssize_t size =strlen (dent->d_name) +1 ; + +if (write (output_fd, dent->d_name, size) != size || +copy_event_system (sys, tps) <0 ) { + err = -EIO ; +free (sys); + goto out; + } }free (sys); }
@@ -343,29 +382,30 @@ out:return err; } -static void read_proc_kallsyms (void ) +static int read_proc_kallsyms (void ) {unsigned int size;const char *path ="/proc/kallsyms" ;struct stat st; -int ret; +int ret, err =0 ; ret =stat (path, &st);if (ret <0 ) {/* not found */ size =0 ; -write_or_die (&size,4 ); -return ; +if (write (output_fd, &size,4 ) !=4 ) + err = -EIO ; +return err; } -record_file (path,4 ); +return record_file (path,4 ); } -static void read_ftrace_printk (void ) +static int read_ftrace_printk (void ) {unsigned int size;char *path;struct stat st; -int ret; +int ret, err =0 ; path =get_tracing_file ("printk_formats" );if (!path)
@@ -375,13 +415,15 @@ static void read_ftrace_printk(void)if (ret <0 ) {/* not found */ size =0 ; -write_or_die (&size,4 ); +if (write (output_fd, &size,4 ) !=4 ) + err = -EIO ; goto out; } -record_file (path,4 ); + err =record_file (path,4 ); out:put_tracing_file (path); +return err; } static struct tracepoint_path *
@@ -428,9 +470,10 @@ bool have_tracepoints(struct list_head *pattrs)return false; } -static void tracing_data_header (void ) +static int tracing_data_header (void ) {char buf[20 ]; +ssize_t size;/* just guessing this is someone's birthday.. ;) */ buf[0 ] =23 ;
@@ -438,9 +481,12 @@ static void tracing_data_header(void) buf[2 ] =68 ;memcpy (buf +3 ,"tracing" ,7 ); -write_or_die (buf,10 ); +if (write (output_fd, buf,10 ) !=10 ) +return -1 ; -write_or_die (VERSION ,strlen (VERSION ) +1 ); + size =strlen (VERSION ) +1 ; +if (write (output_fd,VERSION , size) != size) +return -1 ;/* save endian */ if (bigendian ())
@@ -450,14 +496,19 @@ static void tracing_data_header(void)read_trace_init (buf[0 ], buf[0 ]); -write_or_die (buf,1 ); +if (write (output_fd, buf,1 ) !=1 ) +return -1 ;/* save size of long */ buf[0 ] =sizeof (long ); -write_or_die (buf,1 ); +if (write (output_fd, buf,1 ) !=1 ) +return -1 ;/* save page_size */ -write_or_die (&page_size,4 ); +if (write (output_fd, &page_size,4 ) !=4 ) +return -1 ; + +return 0 ; } struct tracing_data *tracing_data_get(struct list_head *pattrs,
@@ -465,6 +516,7 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, {struct tracepoint_path *tps;struct tracing_data *tdata; +int err; output_fd = fd;
@@ -498,13 +550,24 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, output_fd = temp_fd; } -tracing_data_header (); -read_header_files (); -read_ftrace_files (tps); -read_event_files (tps); -read_proc_kallsyms (); -read_ftrace_printk (); + err =tracing_data_header (); +if (err) + goto out; + err =read_header_files (); +if (err) + goto out; + err =read_ftrace_files (tps); +if (err) + goto out; + err =read_event_files (tps); +if (err) + goto out; + err =read_proc_kallsyms (); +if (err) + goto out; + err =read_ftrace_printk (); +out:/* * All tracing data are stored by now, we can restore * the default output file in case we used temp file.
@@ -515,22 +578,31 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, output_fd = fd; } +if (err) { +free (tdata); + tdata =NULL ; + } +put_tracepoints_path (tps);return tdata; } -void tracing_data_put (struct tracing_data *tdata) +int tracing_data_put (struct tracing_data *tdata) { +int err =0 ; +if (tdata->temp) { -record_file (tdata->temp_file,0 ); + err =record_file (tdata->temp_file,0 );unlink (tdata->temp_file); }free (tdata); +return err; }int read_tracing_data (int fd,struct list_head *pattrs) { +int err;struct tracing_data *tdata;/*
@@ -541,6 +613,6 @@ int read_tracing_data(int fd, struct list_head *pattrs)if (!tdata)return -ENOMEM ; -tracing_data_put (tdata); -return 0 ; + err =tracing_data_put (tdata); +return err; }
tools/perf/util/trace-event.h +1 -1
@@ -68,7 +68,7 @@ struct tracing_data {struct tracing_data *tracing_data_get (struct list_head *pattrs,int fd,bool temp); -void tracing_data_put (struct tracing_data *tdata); +int tracing_data_put (struct tracing_data *tdata);struct addr_location ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of write_or_die() from trace-event-info.c
perf tools: Get rid of write_or_die() from trace-event-info.c
Commit-ID: 8755d5e202c3ef62e33d75426c2f0005e3f70ca9 Gitweb: http://git.kernel.org/tip/8755d5e202c3ef62e33d75426c2f0005e3f70ca9 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:46 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:15:42 -0300
perf tools: Get rid of write_or_die() from trace-event-info.c
Check return value of write and fail if error.
--- tools/perf/util/trace-event-info.c | 180 ++++++++++++++++++++++++++----------- tools/perf/util/trace-event.h | 2 +- 2 files changed, 127 insertions(+), 55 deletions(-)
tools/perf/util/trace-event-info.c +126 -54
@@ -106,17 +106,6 @@ static void put_tracing_file(char *file)free (file); } -static ssize_t write_or_die (const void *buf,size_t len) -{ -int ret; - - ret =write (output_fd, buf, len); -if (ret <0 ) -die ("writing to '%s'" , output_file); - -return ret; -} -int bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 ,0x0 ,0x0 ,0x0 ,0x0 };
@@ -127,29 +116,32 @@ int bigendian(void) }/* unfortunately, you can not stat debugfs or proc files for size */ -static void record_file (const char *file,size_t hdr_sz) +static int record_file (const char *file,ssize_t hdr_sz) {unsigned long long size =0 ;char buf[BUFSIZ ], *sizep;off_t hdr_pos =lseek (output_fd,0 ,SEEK_CUR );int r, fd; +int err = -EIO ; fd =open (file,O_RDONLY );if (fd <0 )die ("Can't read '%s'" , file);/* put in zeros for file size, then fill true size later */ -if (hdr_sz) -write_or_die (&size, hdr_sz); +if (hdr_sz) { +if (write (output_fd, &size, hdr_sz) != hdr_sz) + goto out; + }do { r =read (fd, buf,BUFSIZ );if (r >0 ) { size += r; -write_or_die (buf, r); +if (write (output_fd, buf, r) != r) + goto out; } }while (r >0 ); -close (fd);/* ugh, handle big-endian hdr_size == 4 */ sizep = (char *)&size;
@@ -158,12 +150,18 @@ static void record_file(const char *file, size_t hdr_sz)if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 )die ("writing to %s" , output_file); + + err =0 ; +out: +close (fd); +return err; } -static void read_header_files (void ) +static int read_header_files (void ) {char *path;struct stat st; +int err = -EIO ; path =get_tracing_file ("events/header_page" );if (!path)
@@ -172,8 +170,16 @@ static void read_header_files(void)if (stat (path, &st) <0 )die ("can't read '%s'" , path); -write_or_die ("header_page" ,12 ); -record_file (path,8 ); +if (write (output_fd,"header_page" ,12 ) !=12 ) { +pr_debug ("can't write header_page\n" ); + goto out; + } + +if (record_file (path,8 ) <0 ) { +pr_debug ("can't record header_page file\n" ); + goto out; + } +put_tracing_file (path); path =get_tracing_file ("events/header_event" );
@@ -183,9 +189,20 @@ static void read_header_files(void)if (stat (path, &st) <0 )die ("can't read '%s'" , path); -write_or_die ("header_event" ,13 ); -record_file (path,8 ); +if (write (output_fd,"header_event" ,13 ) !=13 ) { +pr_debug ("can't write header_event\n" ); + goto out; + } + +if (record_file (path,8 ) <0 ) { +pr_debug ("can't record header_event file\n" ); + goto out; + } + + err =0 ; +out:put_tracing_file (path); +return err; }static bool name_in_tp_list (char *sys,struct tracepoint_path *tps)
@@ -232,7 +249,11 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps) count++; } -write_or_die (&count,4 ); +if (write (output_fd, &count,4 ) !=4 ) { + err = -EIO ; +pr_debug ("can't write count\n" ); + goto out; + }rewinddir (dir);while ((dent =readdir (dir))) {
@@ -249,8 +270,13 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)sprintf (format,"%s/%s/format" , sys, dent->d_name); ret =stat (format, &st); -if (ret >=0 ) -record_file (format,8 ); +if (ret >=0 ) { + err =record_file (format,8 ); +if (err) { +free (format); + goto out; + } + }free (format); } err =0 ;
@@ -259,17 +285,20 @@ out:return err; } -static void read_ftrace_files (struct tracepoint_path *tps) +static int read_ftrace_files (struct tracepoint_path *tps) {char *path; +int ret; path =get_tracing_file ("events/ftrace" );if (!path)die ("can't get tracing/events/ftrace" ); -copy_event_system (path, tps); + ret =copy_event_system (path, tps);put_tracing_file (path); + +return ret; }static bool system_in_tp_list (char *sys,struct tracepoint_path *tps)
@@ -312,7 +341,11 @@ static int read_event_files(struct tracepoint_path *tps) count++; } -write_or_die (&count,4 ); +if (write (output_fd, &count,4 ) !=4 ) { + err = -EIO ; +pr_debug ("can't write count\n" ); + goto out; + }rewinddir (dir);while ((dent =readdir (dir))) {
@@ -330,8 +363,14 @@ static int read_event_files(struct tracepoint_path *tps)sprintf (sys,"%s/%s" , path, dent->d_name); ret =stat (sys, &st);if (ret >=0 ) { -write_or_die (dent->d_name,strlen (dent->d_name) +1 ); -copy_event_system (sys, tps); +ssize_t size =strlen (dent->d_name) +1 ; + +if (write (output_fd, dent->d_name, size) != size || +copy_event_system (sys, tps) <0 ) { + err = -EIO ; +free (sys); + goto out; + } }free (sys); }
@@ -343,29 +382,30 @@ out:return err; } -static void read_proc_kallsyms (void ) +static int read_proc_kallsyms (void ) {unsigned int size;const char *path ="/proc/kallsyms" ;struct stat st; -int ret; +int ret, err =0 ; ret =stat (path, &st);if (ret <0 ) {/* not found */ size =0 ; -write_or_die (&size,4 ); -return ; +if (write (output_fd, &size,4 ) !=4 ) + err = -EIO ; +return err; } -record_file (path,4 ); +return record_file (path,4 ); } -static void read_ftrace_printk (void ) +static int read_ftrace_printk (void ) {unsigned int size;char *path;struct stat st; -int ret; +int ret, err =0 ; path =get_tracing_file ("printk_formats" );if (!path)
@@ -375,13 +415,15 @@ static void read_ftrace_printk(void)if (ret <0 ) {/* not found */ size =0 ; -write_or_die (&size,4 ); +if (write (output_fd, &size,4 ) !=4 ) + err = -EIO ; goto out; } -record_file (path,4 ); + err =record_file (path,4 ); out:put_tracing_file (path); +return err; } static struct tracepoint_path *
@@ -428,9 +470,10 @@ bool have_tracepoints(struct list_head *pattrs)return false; } -static void tracing_data_header (void ) +static int tracing_data_header (void ) {char buf[20 ]; +ssize_t size;/* just guessing this is someone's birthday.. ;) */ buf[0 ] =23 ;
@@ -438,9 +481,12 @@ static void tracing_data_header(void) buf[2 ] =68 ;memcpy (buf +3 ,"tracing" ,7 ); -write_or_die (buf,10 ); +if (write (output_fd, buf,10 ) !=10 ) +return -1 ; -write_or_die (VERSION ,strlen (VERSION ) +1 ); + size =strlen (VERSION ) +1 ; +if (write (output_fd,VERSION , size) != size) +return -1 ;/* save endian */ if (bigendian ())
@@ -450,14 +496,19 @@ static void tracing_data_header(void)read_trace_init (buf[0 ], buf[0 ]); -write_or_die (buf,1 ); +if (write (output_fd, buf,1 ) !=1 ) +return -1 ;/* save size of long */ buf[0 ] =sizeof (long ); -write_or_die (buf,1 ); +if (write (output_fd, buf,1 ) !=1 ) +return -1 ;/* save page_size */ -write_or_die (&page_size,4 ); +if (write (output_fd, &page_size,4 ) !=4 ) +return -1 ; + +return 0 ; } struct tracing_data *tracing_data_get(struct list_head *pattrs,
@@ -465,6 +516,7 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, {struct tracepoint_path *tps;struct tracing_data *tdata; +int err; output_fd = fd;
@@ -498,13 +550,24 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, output_fd = temp_fd; } -tracing_data_header (); -read_header_files (); -read_ftrace_files (tps); -read_event_files (tps); -read_proc_kallsyms (); -read_ftrace_printk (); + err =tracing_data_header (); +if (err) + goto out; + err =read_header_files (); +if (err) + goto out; + err =read_ftrace_files (tps); +if (err) + goto out; + err =read_event_files (tps); +if (err) + goto out; + err =read_proc_kallsyms (); +if (err) + goto out; + err =read_ftrace_printk (); +out:/* * All tracing data are stored by now, we can restore * the default output file in case we used temp file.
@@ -515,22 +578,31 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs, output_fd = fd; } +if (err) { +free (tdata); + tdata =NULL ; + } +put_tracepoints_path (tps);return tdata; } -void tracing_data_put (struct tracing_data *tdata) +int tracing_data_put (struct tracing_data *tdata) { +int err =0 ; +if (tdata->temp) { -record_file (tdata->temp_file,0 ); + err =record_file (tdata->temp_file,0 );unlink (tdata->temp_file); }free (tdata); +return err; }int read_tracing_data (int fd,struct list_head *pattrs) { +int err;struct tracing_data *tdata;/*
@@ -541,6 +613,6 @@ int read_tracing_data(int fd, struct list_head *pattrs)if (!tdata)return -ENOMEM ; -tracing_data_put (tdata); -return 0 ; + err =tracing_data_put (tdata); +return err; }
tools/perf/util/trace-event.h +1 -1
@@ -68,7 +68,7 @@ struct tracing_data {struct tracing_data *tracing_data_get (struct list_head *pattrs,int fd,bool temp); -void tracing_data_put (struct tracing_data *tdata); +int tracing_data_put (struct tracing_data *tdata);struct addr_location ;
Namhyung Kim
maintainerPATCH 4/9 perf util: Get rid of die() calls from trace-event-info.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Now remove all remaining die() calls and convert them to check return value and propagate it.
--- tools/perf/util/trace-event-info.c | 114 +++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 42 deletions(-)
tools/perf/util/trace-event-info.c +72 -42
@@ -43,7 +43,6 @@#define VERSION "0.5" -static const char *output_file ="trace.info" ;static int output_fd;
@@ -125,8 +124,10 @@ static int record_file(const char *file, ssize_t hdr_sz)int err = -EIO ; fd =open (file,O_RDONLY ); -if (fd <0 ) -die ("Can't read '%s'" , file); +if (fd <0 ) { +pr_debug ("Can't read '%s'" , file); +return -errno; + }/* put in zeros for file size, then fill true size later */ if (hdr_sz) {
@@ -148,8 +149,10 @@ static int record_file(const char *file, ssize_t hdr_sz)if (bigendian ()) sizep +=sizeof (u64) - hdr_sz; -if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 ) -die ("writing to %s" , output_file); +if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 ) { +pr_debug ("writing file size failed\n" ); + goto out; + } err =0 ; out:
@@ -164,11 +167,15 @@ static int read_header_files(void)int err = -EIO ; path =get_tracing_file ("events/header_page" ); -if (!path) -die ("can't get tracing/events/header_page" ); +if (!path) { +pr_debug ("can't get tracing/events/header_page" ); +return -ENOMEM ; + } -if (stat (path, &st) <0 ) -die ("can't read '%s'" , path); +if (stat (path, &st) <0 ) { +pr_debug ("can't read '%s'" , path); + goto out; + }if (write (output_fd,"header_page" ,12 ) !=12 ) {pr_debug ("can't write header_page\n" );
@@ -183,11 +190,16 @@ static int read_header_files(void)put_tracing_file (path); path =get_tracing_file ("events/header_event" ); -if (!path) -die ("can't get tracing/events/header_event" ); +if (!path) { +pr_debug ("can't get tracing/events/header_event" ); + err = -ENOMEM ; + goto out; + } -if (stat (path, &st) <0 ) -die ("can't read '%s'" , path); +if (stat (path, &st) <0 ) { +pr_debug ("can't read '%s'" , path); + goto out; + }if (write (output_fd,"header_event" ,13 ) !=13 ) {pr_debug ("can't write header_event\n" );
@@ -227,8 +239,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)int err; dir =opendir (sys); -if (!dir) -die ("can't read directory '%s'" , sys); +if (!dir) { +pr_debug ("can't read directory '%s'" , sys); +return -errno; + }while ((dent =readdir (dir))) { if (dent->d_type != DT_DIR ||
@@ -291,8 +305,10 @@ static int read_ftrace_files(struct tracepoint_path *tps)int ret; path =get_tracing_file ("events/ftrace" ); -if (!path) -die ("can't get tracing/events/ftrace" ); +if (!path) { +pr_debug ("can't get tracing/events/ftrace" ); +return -ENOMEM ; + } ret =copy_event_system (path, tps);
@@ -324,12 +340,17 @@ static int read_event_files(struct tracepoint_path *tps)int err; path =get_tracing_file ("events" ); -if (!path) -die ("can't get tracing/events" ); +if (!path) { +pr_debug ("can't get tracing/events" ); +return -ENOMEM ; + } dir =opendir (path); -if (!dir) -die ("can't read directory '%s'" , path); +if (!dir) { + err = -errno; +pr_debug ("can't read directory '%s'" , path); + goto out; + }while ((dent =readdir (dir))) { if (dent->d_type != DT_DIR ||
@@ -408,8 +429,10 @@ static int read_ftrace_printk(void)int ret, err =0 ; path =get_tracing_file ("printk_formats" ); -if (!path) -die ("can't get tracing/printk_formats" ); +if (!path) { +pr_debug ("can't get tracing/printk_formats" ); +return -ENOMEM ; + } ret =stat (path, &st);if (ret <0 ) {
@@ -426,6 +449,19 @@ out:return err; } +static void +put_tracepoints_path (struct tracepoint_path *tps) +{ +while (tps) { +struct tracepoint_path *t = tps; + + tps = tps->next; +free (t->name); +free (t->system); +free (t); + } +} +static struct tracepoint_path *get_tracepoints_path (struct list_head *pattrs) {
@@ -438,27 +474,17 @@ get_tracepoints_path(struct list_head *pattrs)continue ; ++nr_tracepoints; ppath->next =tracepoint_id_to_path (pos->attr.config); -if (!ppath->next) -die ("%s\n" ,"No memory to alloc tracepoints list" ); +if (!ppath->next) { +pr_debug ("No memory to alloc tracepoints list\n" ); +put_tracepoints_path (&path); +return NULL ; + } ppath = ppath->next; }return nr_tracepoints >0 ? path.next :NULL ; } -static void -put_tracepoints_path (struct tracepoint_path *tps) -{ -while (tps) { -struct tracepoint_path *t = tps; - - tps = tps->next; -free (t->name); -free (t->system); -free (t); - } -} -bool have_tracepoints (struct list_head *pattrs) {struct perf_evsel *pos;
@@ -536,12 +562,16 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,snprintf (tdata->temp_file,sizeof (tdata->temp_file),"/tmp/perf-XXXXXX" ); -if (!mkstemp (tdata->temp_file)) -die ("Can't make temp file" ); +if (!mkstemp (tdata->temp_file)) { +pr_debug ("Can't make temp file" ); +return NULL ; + } temp_fd =open (tdata->temp_file,O_RDWR ); -if (temp_fd <0 ) -die ("Can't read '%s'" , tdata->temp_file); +if (temp_fd <0 ) { +pr_debug ("Can't read '%s'" , tdata->temp_file); +return NULL ; + }/* * Set the temp file the default output, so all the
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of die() calls from trace-event-info.c
perf tools: Get rid of die() calls from trace-event-info.c
Commit-ID: 7f42b9505aee3fa9cb465a670989e3d426a1f3f2 Gitweb: http://git.kernel.org/tip/7f42b9505aee3fa9cb465a670989e3d426a1f3f2 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:47 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:30:10 -0300
perf tools: Get rid of die() calls from trace-event-info.c
Now remove all remaining die() calls and convert them to check return value and propagate it.
--- tools/perf/util/trace-event-info.c | 114 +++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 42 deletions(-)
tools/perf/util/trace-event-info.c +72 -42
@@ -43,7 +43,6 @@#define VERSION "0.5" -static const char *output_file ="trace.info" ;static int output_fd;
@@ -125,8 +124,10 @@ static int record_file(const char *file, ssize_t hdr_sz)int err = -EIO ; fd =open (file,O_RDONLY ); -if (fd <0 ) -die ("Can't read '%s'" , file); +if (fd <0 ) { +pr_debug ("Can't read '%s'" , file); +return -errno; + }/* put in zeros for file size, then fill true size later */ if (hdr_sz) {
@@ -148,8 +149,10 @@ static int record_file(const char *file, ssize_t hdr_sz)if (bigendian ()) sizep +=sizeof (u64) - hdr_sz; -if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 ) -die ("writing to %s" , output_file); +if (hdr_sz &&pwrite (output_fd, sizep, hdr_sz, hdr_pos) <0 ) { +pr_debug ("writing file size failed\n" ); + goto out; + } err =0 ; out:
@@ -164,11 +167,15 @@ static int read_header_files(void)int err = -EIO ; path =get_tracing_file ("events/header_page" ); -if (!path) -die ("can't get tracing/events/header_page" ); +if (!path) { +pr_debug ("can't get tracing/events/header_page" ); +return -ENOMEM ; + } -if (stat (path, &st) <0 ) -die ("can't read '%s'" , path); +if (stat (path, &st) <0 ) { +pr_debug ("can't read '%s'" , path); + goto out; + }if (write (output_fd,"header_page" ,12 ) !=12 ) {pr_debug ("can't write header_page\n" );
@@ -183,11 +190,16 @@ static int read_header_files(void)put_tracing_file (path); path =get_tracing_file ("events/header_event" ); -if (!path) -die ("can't get tracing/events/header_event" ); +if (!path) { +pr_debug ("can't get tracing/events/header_event" ); + err = -ENOMEM ; + goto out; + } -if (stat (path, &st) <0 ) -die ("can't read '%s'" , path); +if (stat (path, &st) <0 ) { +pr_debug ("can't read '%s'" , path); + goto out; + }if (write (output_fd,"header_event" ,13 ) !=13 ) {pr_debug ("can't write header_event\n" );
@@ -227,8 +239,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)int err; dir =opendir (sys); -if (!dir) -die ("can't read directory '%s'" , sys); +if (!dir) { +pr_debug ("can't read directory '%s'" , sys); +return -errno; + }while ((dent =readdir (dir))) { if (dent->d_type != DT_DIR ||
@@ -291,8 +305,10 @@ static int read_ftrace_files(struct tracepoint_path *tps)int ret; path =get_tracing_file ("events/ftrace" ); -if (!path) -die ("can't get tracing/events/ftrace" ); +if (!path) { +pr_debug ("can't get tracing/events/ftrace" ); +return -ENOMEM ; + } ret =copy_event_system (path, tps);
@@ -324,12 +340,17 @@ static int read_event_files(struct tracepoint_path *tps)int err; path =get_tracing_file ("events" ); -if (!path) -die ("can't get tracing/events" ); +if (!path) { +pr_debug ("can't get tracing/events" ); +return -ENOMEM ; + } dir =opendir (path); -if (!dir) -die ("can't read directory '%s'" , path); +if (!dir) { + err = -errno; +pr_debug ("can't read directory '%s'" , path); + goto out; + }while ((dent =readdir (dir))) { if (dent->d_type != DT_DIR ||
@@ -408,8 +429,10 @@ static int read_ftrace_printk(void)int ret, err =0 ; path =get_tracing_file ("printk_formats" ); -if (!path) -die ("can't get tracing/printk_formats" ); +if (!path) { +pr_debug ("can't get tracing/printk_formats" ); +return -ENOMEM ; + } ret =stat (path, &st);if (ret <0 ) {
@@ -426,6 +449,19 @@ out:return err; } +static void +put_tracepoints_path (struct tracepoint_path *tps) +{ +while (tps) { +struct tracepoint_path *t = tps; + + tps = tps->next; +free (t->name); +free (t->system); +free (t); + } +} +static struct tracepoint_path *get_tracepoints_path (struct list_head *pattrs) {
@@ -438,27 +474,17 @@ get_tracepoints_path(struct list_head *pattrs)continue ; ++nr_tracepoints; ppath->next =tracepoint_id_to_path (pos->attr.config); -if (!ppath->next) -die ("%s\n" ,"No memory to alloc tracepoints list" ); +if (!ppath->next) { +pr_debug ("No memory to alloc tracepoints list\n" ); +put_tracepoints_path (&path); +return NULL ; + } ppath = ppath->next; }return nr_tracepoints >0 ? path.next :NULL ; } -static void -put_tracepoints_path (struct tracepoint_path *tps) -{ -while (tps) { -struct tracepoint_path *t = tps; - - tps = tps->next; -free (t->name); -free (t->system); -free (t); - } -} -bool have_tracepoints (struct list_head *pattrs) {struct perf_evsel *pos;
@@ -536,12 +562,16 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,snprintf (tdata->temp_file,sizeof (tdata->temp_file),"/tmp/perf-XXXXXX" ); -if (!mkstemp (tdata->temp_file)) -die ("Can't make temp file" ); +if (!mkstemp (tdata->temp_file)) { +pr_debug ("Can't make temp file" ); +return NULL ; + } temp_fd =open (tdata->temp_file,O_RDWR ); -if (temp_fd <0 ) -die ("Can't read '%s'" , tdata->temp_file); +if (temp_fd <0 ) { +pr_debug ("Can't read '%s'" , tdata->temp_file); +return NULL ; + }/* * Set the temp file the default output, so all the
Namhyung Kim
maintainerPATCH 5/9 perf util: Handle failure case in trace_report()
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
If pevent allocation in read_trace_init() fails, trace_report() will return -1 and *ppevent is set to NULL. Its callers should check this case and handle it properly.
This is also a preparation for the removal of *die() calls.
--- tools/perf/util/header.c | 9 +++++++-- tools/perf/util/trace-event-read.c | 41 ++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 19 deletions(-)
tools/perf/util/header.c +7 -2
@@ -1672,8 +1672,8 @@ static int process_tracing_data(struct perf_file_section *section __maybe_unusedstruct perf_header *ph__maybe_unused , int fd, void *data) { -trace_report (fd ,data ,false ); -return 0 ; + ssize_t ret = trace_report(fd, data, false); +return ret <0 ?-1 :0 ; } static int process_build_id(struct perf_file_section *section,
@@ -2752,6 +2752,11 @@ static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel,if (evsel->tp_format)return 0 ; +if (pevent ==NULL ) { +pr_debug ("broken or missing trace data\n" ); +return -1 ; + } + event =pevent_find_event (pevent, evsel->attr.config);if (event ==NULL )return -1 ;
tools/perf/util/trace-event-read.c +24 -17
65 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Handle failure case in trace_report()
perf tools: Handle failure case in trace_report()
Commit-ID: 3dce2ce3cc40ece2562a5a83e879b4bfb451476c Gitweb: http://git.kernel.org/tip/3dce2ce3cc40ece2562a5a83e879b4bfb451476c Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:48 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:30:52 -0300
perf tools: Handle failure case in trace_report()
If pevent allocation in read_trace_init() fails, trace_report() will return -1 and *ppevent is set to NULL. Its callers should check this case and handle it properly.
This is also a preparation for the removal of *die() calls.
--- tools/perf/util/header.c | 9 +++++++-- tools/perf/util/trace-event-read.c | 41 ++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 19 deletions(-)
tools/perf/util/header.c +7 -2
@@ -1670,8 +1670,8 @@ static int process_tracing_data(struct perf_file_section *section __maybe_unusedstruct perf_header *ph__maybe_unused , int fd, void *data) { -trace_report (fd ,data ,false ); -return 0 ; + ssize_t ret = trace_report(fd, data, false); +return ret <0 ?-1 :0 ; } static int process_build_id(struct perf_file_section *section,
@@ -2750,6 +2750,11 @@ static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel,if (evsel->tp_format)return 0 ; +if (pevent ==NULL ) { +pr_debug ("broken or missing trace data\n" ); +return -1 ; + } + event =pevent_find_event (pevent, evsel->attr.config);if (event ==NULL )return -1 ;
tools/perf/util/trace-event-read.c +24 -17
65 lines not on this page · raw message
Namhyung Kim
maintainerPATCH 6/9 perf util: Get rid of malloc_or_die() in trace-event-read.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Check return value of malloc() and fail if error. Now read_string() can return NULL also check its return value and bail out.
--- tools/perf/util/trace-event-read.c | 100 +++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 33 deletions(-)
tools/perf/util/trace-event-read.c +67 -33
@@ -48,16 +48,6 @@ static int long_size;static ssize_t calc_data_size;static bool repipe; -static void *malloc_or_die (int size) -{ -void *ret; - - ret =malloc (size); -if (!ret) -die ("malloc" ); -return ret; -} -static int do_read (int fd,void *buf,int size) {int rsize = size;
@@ -158,48 +148,57 @@ static char *read_string(void)if (calc_data_size) calc_data_size += size; - str =malloc_or_die (size); -memcpy (str, buf, size); + str =malloc (size); +if (str) +memcpy (str, buf, size);return str; } -static void read_proc_kallsyms (struct pevent *pevent) +static int read_proc_kallsyms (struct pevent *pevent) {unsigned int size;char *buf; size =read4 (pevent);if (!size) -return ; +return 0 ; + + buf =malloc (size +1 ); +if (buf ==NULL ) +return -1 ; - buf =malloc_or_die (size +1 );read_or_die (buf, size); buf[size] ='\0' ;parse_proc_kallsyms (pevent, buf, size);free (buf); +return 0 ; } -static void read_ftrace_printk (struct pevent *pevent) +static int read_ftrace_printk (struct pevent *pevent) {unsigned int size;char *buf; size =read4 (pevent);if (!size) -return ; +return 0 ; + + buf =malloc (size); +if (buf ==NULL ) +return -1 ; - buf =malloc_or_die (size);read_or_die (buf, size);parse_ftrace_printk (pevent, buf, size);free (buf); +return 0 ; } -static void read_header_files (struct pevent *pevent) +static int read_header_files (struct pevent *pevent) {unsigned long long size;char *header_event;
@@ -224,65 +223,87 @@ static void read_header_files(struct pevent *pevent)die ("did not read header event" ); size =read8 (pevent); - header_event =malloc_or_die (size); + header_event =malloc (size); +if (header_event ==NULL ) +return -1 ; +read_or_die (header_event, size);free (header_event); +return 0 ; } -static void read_ftrace_file (struct pevent *pevent,unsigned long long size) +static int read_ftrace_file (struct pevent *pevent,unsigned long long size) {char *buf; - buf =malloc_or_die (size); + buf =malloc (size); +if (buf ==NULL ) +return -1 ; +read_or_die (buf, size);parse_ftrace_file (pevent, buf, size);free (buf); +return 0 ; } -static void read_event_file (struct pevent *pevent,char *sys, +static int read_event_file (struct pevent *pevent,char *sys,unsigned long long size) {char *buf; - buf =malloc_or_die (size); + buf =malloc (size); +if (buf ==NULL ) +return -1 ; +read_or_die (buf, size);parse_event_file (pevent, buf, size, sys);free (buf); +return 0 ; } -static void read_ftrace_files (struct pevent *pevent) +static int read_ftrace_files (struct pevent *pevent) {unsigned long long size;int count;int i; +int ret; count =read4 (pevent);for (i =0 ; i < count; i++) { size =read8 (pevent); -read_ftrace_file (pevent, size); + ret =read_ftrace_file (pevent, size); +if (ret) +return ret; } +return 0 ; } -static void read_event_files (struct pevent *pevent) +static int read_event_files (struct pevent *pevent) {unsigned long long size;char *sys;int systems;int count;int i,x; +int ret; systems =read4 (pevent);for (i =0 ; i < systems; i++) { sys =read_string (); +if (sys ==NULL ) +return -1 ; count =read4 (pevent);for (x=0 ; x < count; x++) { size =read8 (pevent); -read_event_file (pevent, sys, size); + ret =read_event_file (pevent, sys, size); +if (ret) +return ret; } } +return 0 ; }ssize_t trace_report (int fd,struct pevent **ppevent,bool __repipe)
@@ -295,6 +316,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)int show_printk =0 ;ssize_t size =-1 ;struct pevent *pevent; +int err; *ppevent =NULL ;
@@ -312,6 +334,8 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)die ("not a trace file (missing 'tracing' tag)" ); version =read_string (); +if (version ==NULL ) +return -1 ;if (show_version)printf ("version = %s\n" , version);free (version);
@@ -331,11 +355,21 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) page_size =read4 (pevent); -read_header_files (pevent); -read_ftrace_files (pevent); -read_event_files (pevent); -read_proc_kallsyms (pevent); -read_ftrace_printk (pevent); + err =read_header_files (pevent); +if (err) + goto out; + err =read_ftrace_files (pevent); +if (err) + goto out; + err =read_event_files (pevent); +if (err) + goto out; + err =read_proc_kallsyms (pevent); +if (err) + goto out; + err =read_ftrace_printk (pevent); +if (err) + goto out; size = calc_data_size -1 ; calc_data_size =0 ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of malloc_or_die() in trace-event-read.c
perf tools: Get rid of malloc_or_die() in trace-event-read.c
Commit-ID: a4c983670e0f4285fe115cb2ad697c978c7950b6 Gitweb: http://git.kernel.org/tip/a4c983670e0f4285fe115cb2ad697c978c7950b6 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:49 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:32:46 -0300
perf tools: Get rid of malloc_or_die() in trace-event-read.c
Check return value of malloc() and fail if error. Now read_string() can return NULL also check its return value and bail out.
--- tools/perf/util/trace-event-read.c | 100 +++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 33 deletions(-)
tools/perf/util/trace-event-read.c +67 -33
@@ -46,16 +46,6 @@ static int long_size;static ssize_t calc_data_size;static bool repipe; -static void *malloc_or_die (int size) -{ -void *ret; - - ret =malloc (size); -if (!ret) -die ("malloc" ); -return ret; -} -static int do_read (int fd,void *buf,int size) {int rsize = size;
@@ -156,48 +146,57 @@ static char *read_string(void)if (calc_data_size) calc_data_size += size; - str =malloc_or_die (size); -memcpy (str, buf, size); + str =malloc (size); +if (str) +memcpy (str, buf, size);return str; } -static void read_proc_kallsyms (struct pevent *pevent) +static int read_proc_kallsyms (struct pevent *pevent) {unsigned int size;char *buf; size =read4 (pevent);if (!size) -return ; +return 0 ; + + buf =malloc (size +1 ); +if (buf ==NULL ) +return -1 ; - buf =malloc_or_die (size +1 );read_or_die (buf, size); buf[size] ='\0' ;parse_proc_kallsyms (pevent, buf, size);free (buf); +return 0 ; } -static void read_ftrace_printk (struct pevent *pevent) +static int read_ftrace_printk (struct pevent *pevent) {unsigned int size;char *buf; size =read4 (pevent);if (!size) -return ; +return 0 ; + + buf =malloc (size); +if (buf ==NULL ) +return -1 ; - buf =malloc_or_die (size);read_or_die (buf, size);parse_ftrace_printk (pevent, buf, size);free (buf); +return 0 ; } -static void read_header_files (struct pevent *pevent) +static int read_header_files (struct pevent *pevent) {unsigned long long size;char *header_event;
@@ -222,65 +221,87 @@ static void read_header_files(struct pevent *pevent)die ("did not read header event" ); size =read8 (pevent); - header_event =malloc_or_die (size); + header_event =malloc (size); +if (header_event ==NULL ) +return -1 ; +read_or_die (header_event, size);free (header_event); +return 0 ; } -static void read_ftrace_file (struct pevent *pevent,unsigned long long size) +static int read_ftrace_file (struct pevent *pevent,unsigned long long size) {char *buf; - buf =malloc_or_die (size); + buf =malloc (size); +if (buf ==NULL ) +return -1 ; +read_or_die (buf, size);parse_ftrace_file (pevent, buf, size);free (buf); +return 0 ; } -static void read_event_file (struct pevent *pevent,char *sys, +static int read_event_file (struct pevent *pevent,char *sys,unsigned long long size) {char *buf; - buf =malloc_or_die (size); + buf =malloc (size); +if (buf ==NULL ) +return -1 ; +read_or_die (buf, size);parse_event_file (pevent, buf, size, sys);free (buf); +return 0 ; } -static void read_ftrace_files (struct pevent *pevent) +static int read_ftrace_files (struct pevent *pevent) {unsigned long long size;int count;int i; +int ret; count =read4 (pevent);for (i =0 ; i < count; i++) { size =read8 (pevent); -read_ftrace_file (pevent, size); + ret =read_ftrace_file (pevent, size); +if (ret) +return ret; } +return 0 ; } -static void read_event_files (struct pevent *pevent) +static int read_event_files (struct pevent *pevent) {unsigned long long size;char *sys;int systems;int count;int i,x; +int ret; systems =read4 (pevent);for (i =0 ; i < systems; i++) { sys =read_string (); +if (sys ==NULL ) +return -1 ; count =read4 (pevent);for (x=0 ; x < count; x++) { size =read8 (pevent); -read_event_file (pevent, sys, size); + ret =read_event_file (pevent, sys, size); +if (ret) +return ret; } } +return 0 ; }ssize_t trace_report (int fd,struct pevent **ppevent,bool __repipe)
@@ -293,6 +314,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)int show_printk =0 ;ssize_t size =-1 ;struct pevent *pevent; +int err; *ppevent =NULL ;
@@ -310,6 +332,8 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)die ("not a trace file (missing 'tracing' tag)" ); version =read_string (); +if (version ==NULL ) +return -1 ;if (show_version)printf ("version = %s\n" , version);free (version);
@@ -329,11 +353,21 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) page_size =read4 (pevent); -read_header_files (pevent); -read_ftrace_files (pevent); -read_event_files (pevent); -read_proc_kallsyms (pevent); -read_ftrace_printk (pevent); + err =read_header_files (pevent); +if (err) + goto out; + err =read_ftrace_files (pevent); +if (err) + goto out; + err =read_event_files (pevent); +if (err) + goto out; + err =read_proc_kallsyms (pevent); +if (err) + goto out; + err =read_ftrace_printk (pevent); +if (err) + goto out; size = calc_data_size -1 ; calc_data_size =0 ;
Namhyung Kim
maintainerPATCH 7/9 perf util: Get rid of read_or_die() in trace-event-read.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Rename it to do_read and original do_read to __do_read, and check their return value.
--- tools/perf/util/trace-event-read.c | 80 +++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 23 deletions(-)
tools/perf/util/trace-event-read.c +57 -23
@@ -48,7 +48,7 @@ static int long_size;static ssize_t calc_data_size;static bool repipe; -static int do_read (int fd,void *buf,int size) +static int __do_read (int fd,void *buf,int size) {int rsize = size;
@@ -61,8 +61,10 @@ static int do_read(int fd, void *buf, int size)if (repipe) {int retw =write (STDOUT_FILENO , buf, ret); -if (retw <=0 || retw != ret) -die ("repiping input file" ); +if (retw <=0 || retw != ret) { +pr_debug ("repiping input file" ); +return -1 ; + } } size -= ret;
@@ -72,14 +74,16 @@ static int do_read(int fd, void *buf, int size)return rsize; } -static int read_or_die (void *data,int size) +static int do_read (void *data,int size) {int r; - r =do_read (input_fd, data, size); -if (r <=0 ) -die ("reading input file (size expected=%d received=%d)" , - size, r); + r =__do_read (input_fd, data, size); +if (r <=0 ) { +pr_debug ("reading input file (size expected=%d received=%d)" , + size, r); +return -1 ; + }if (calc_data_size) calc_data_size += r;
@@ -95,7 +99,7 @@ static void skip(int size)while (size) { r = size >BUFSIZ ?BUFSIZ : size; -read_or_die (buf, r); +do_read (buf, r); size -= r; }; }
@@ -104,7 +108,8 @@ static unsigned int read4(struct pevent *pevent) {unsigned int data; -read_or_die (&data,4 ); +if (do_read (&data,4 ) <0 ) +return 0 ;return __data2host4 (pevent, data); }
@@ -112,7 +117,8 @@ static unsigned long long read8(struct pevent *pevent) {unsigned long long data; -read_or_die (&data,8 ); +if (do_read (&data,8 ) <0 ) +return 0 ;return __data2host8 (pevent, data); }
@@ -168,7 +174,10 @@ static int read_proc_kallsyms(struct pevent *pevent)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } buf[size] ='\0' ;parse_proc_kallsyms (pevent, buf, size);
@@ -182,6 +191,7 @@ static int read_ftrace_printk(struct pevent *pevent)unsigned int size;char *buf; +/* it can have 0 size */ size =read4 (pevent);if (!size)return 0 ;
@@ -190,7 +200,10 @@ static int read_ftrace_printk(struct pevent *pevent)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + }parse_ftrace_printk (pevent, buf, size);
@@ -203,8 +216,10 @@ static int read_header_files(struct pevent *pevent)unsigned long long size;char *header_event;char buf[BUFSIZ ]; +int ret =0 ; -read_or_die (buf,12 ); +if (do_read (buf,12 ) <0 ) +return -1 ;if (memcmp (buf,"header_page" ,12 ) !=0 )die ("did not read header page" );
@@ -218,7 +233,9 @@ static int read_header_files(struct pevent *pevent)*/ long_size = header_page_size_size; -read_or_die (buf,13 ); +if (do_read (buf,13 ) <0 ) +return -1 ; +if (memcmp (buf,"header_event" ,13 ) !=0 )die ("did not read header event" );
@@ -227,9 +244,11 @@ static int read_header_files(struct pevent *pevent)if (header_event ==NULL )return -1 ; -read_or_die (header_event, size); +if (do_read (header_event, size) <0 ) + ret =-1 ; +free (header_event); -return 0 ; +return ret; }static int read_ftrace_file (struct pevent *pevent,unsigned long long size)
@@ -240,7 +259,11 @@ static int read_ftrace_file(struct pevent *pevent, unsigned long long size)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } +parse_ftrace_file (pevent, buf, size);free (buf);return 0 ;
@@ -255,7 +278,11 @@ static int read_event_file(struct pevent *pevent, char *sys,if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } +parse_event_file (pevent, buf, size, sys);free (buf);return 0 ;
@@ -296,6 +323,7 @@ static int read_event_files(struct pevent *pevent)return -1 ; count =read4 (pevent); +for (x=0 ; x < count; x++) { size =read8 (pevent); ret =read_event_file (pevent, sys, size);
@@ -325,11 +353,13 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) input_fd = fd; -read_or_die (buf,3 ); +if (do_read (buf,3 ) <0 ) +return -1 ;if (memcmp (buf, test,3 ) !=0 )die ("no trace data in the file" ); -read_or_die (buf,7 ); +if (do_read (buf,7 ) <0 ) +return -1 ;if (memcmp (buf,"tracing" ,7 ) !=0 )die ("not a trace file (missing 'tracing' tag)" );
@@ -340,7 +370,8 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)printf ("version = %s\n" , version);free (version); -read_or_die (buf,1 ); +if (do_read (buf,1 ) <0 ) +return -1 ; file_bigendian = buf[0 ]; host_bigendian =bigendian ();
@@ -350,10 +381,13 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) goto out; } -read_or_die (buf,1 ); +if (do_read (buf,1 ) <0 ) + goto out; long_size = buf[0 ]; page_size =read4 (pevent); +if (!page_size) + goto out; err =read_header_files (pevent);if (err)
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of read_or_die() in trace-event-read.c
perf tools: Get rid of read_or_die() in trace-event-read.c
Commit-ID: 4a31e56599d42c5ac17b280228349948dee352c7 Gitweb: http://git.kernel.org/tip/4a31e56599d42c5ac17b280228349948dee352c7 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:50 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:34:13 -0300
perf tools: Get rid of read_or_die() in trace-event-read.c
Rename it to do_read and original do_read to __do_read, and check their return value.
--- tools/perf/util/trace-event-read.c | 80 +++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 23 deletions(-)
tools/perf/util/trace-event-read.c +57 -23
@@ -46,7 +46,7 @@ static int long_size;static ssize_t calc_data_size;static bool repipe; -static int do_read (int fd,void *buf,int size) +static int __do_read (int fd,void *buf,int size) {int rsize = size;
@@ -59,8 +59,10 @@ static int do_read(int fd, void *buf, int size)if (repipe) {int retw =write (STDOUT_FILENO , buf, ret); -if (retw <=0 || retw != ret) -die ("repiping input file" ); +if (retw <=0 || retw != ret) { +pr_debug ("repiping input file" ); +return -1 ; + } } size -= ret;
@@ -70,14 +72,16 @@ static int do_read(int fd, void *buf, int size)return rsize; } -static int read_or_die (void *data,int size) +static int do_read (void *data,int size) {int r; - r =do_read (input_fd, data, size); -if (r <=0 ) -die ("reading input file (size expected=%d received=%d)" , - size, r); + r =__do_read (input_fd, data, size); +if (r <=0 ) { +pr_debug ("reading input file (size expected=%d received=%d)" , + size, r); +return -1 ; + }if (calc_data_size) calc_data_size += r;
@@ -93,7 +97,7 @@ static void skip(int size)while (size) { r = size >BUFSIZ ?BUFSIZ : size; -read_or_die (buf, r); +do_read (buf, r); size -= r; }; }
@@ -102,7 +106,8 @@ static unsigned int read4(struct pevent *pevent) {unsigned int data; -read_or_die (&data,4 ); +if (do_read (&data,4 ) <0 ) +return 0 ;return __data2host4 (pevent, data); }
@@ -110,7 +115,8 @@ static unsigned long long read8(struct pevent *pevent) {unsigned long long data; -read_or_die (&data,8 ); +if (do_read (&data,8 ) <0 ) +return 0 ;return __data2host8 (pevent, data); }
@@ -166,7 +172,10 @@ static int read_proc_kallsyms(struct pevent *pevent)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } buf[size] ='\0' ;parse_proc_kallsyms (pevent, buf, size);
@@ -180,6 +189,7 @@ static int read_ftrace_printk(struct pevent *pevent)unsigned int size;char *buf; +/* it can have 0 size */ size =read4 (pevent);if (!size)return 0 ;
@@ -188,7 +198,10 @@ static int read_ftrace_printk(struct pevent *pevent)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + }parse_ftrace_printk (pevent, buf, size);
@@ -201,8 +214,10 @@ static int read_header_files(struct pevent *pevent)unsigned long long size;char *header_event;char buf[BUFSIZ ]; +int ret =0 ; -read_or_die (buf,12 ); +if (do_read (buf,12 ) <0 ) +return -1 ;if (memcmp (buf,"header_page" ,12 ) !=0 )die ("did not read header page" );
@@ -216,7 +231,9 @@ static int read_header_files(struct pevent *pevent)*/ long_size = header_page_size_size; -read_or_die (buf,13 ); +if (do_read (buf,13 ) <0 ) +return -1 ; +if (memcmp (buf,"header_event" ,13 ) !=0 )die ("did not read header event" );
@@ -225,9 +242,11 @@ static int read_header_files(struct pevent *pevent)if (header_event ==NULL )return -1 ; -read_or_die (header_event, size); +if (do_read (header_event, size) <0 ) + ret =-1 ; +free (header_event); -return 0 ; +return ret; }static int read_ftrace_file (struct pevent *pevent,unsigned long long size)
@@ -238,7 +257,11 @@ static int read_ftrace_file(struct pevent *pevent, unsigned long long size)if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } +parse_ftrace_file (pevent, buf, size);free (buf);return 0 ;
@@ -253,7 +276,11 @@ static int read_event_file(struct pevent *pevent, char *sys,if (buf ==NULL )return -1 ; -read_or_die (buf, size); +if (do_read (buf, size) <0 ) { +free (buf); +return -1 ; + } +parse_event_file (pevent, buf, size, sys);free (buf);return 0 ;
@@ -294,6 +321,7 @@ static int read_event_files(struct pevent *pevent)return -1 ; count =read4 (pevent); +for (x=0 ; x < count; x++) { size =read8 (pevent); ret =read_event_file (pevent, sys, size);
@@ -323,11 +351,13 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) input_fd = fd; -read_or_die (buf,3 ); +if (do_read (buf,3 ) <0 ) +return -1 ;if (memcmp (buf, test,3 ) !=0 )die ("no trace data in the file" ); -read_or_die (buf,7 ); +if (do_read (buf,7 ) <0 ) +return -1 ;if (memcmp (buf,"tracing" ,7 ) !=0 )die ("not a trace file (missing 'tracing' tag)" );
@@ -338,7 +368,8 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)printf ("version = %s\n" , version);free (version); -read_or_die (buf,1 ); +if (do_read (buf,1 ) <0 ) +return -1 ; file_bigendian = buf[0 ]; host_bigendian =bigendian ();
@@ -348,10 +379,13 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) goto out; } -read_or_die (buf,1 ); +if (do_read (buf,1 ) <0 ) + goto out; long_size = buf[0 ]; page_size =read4 (pevent); +if (!page_size) + goto out; err =read_header_files (pevent);if (err)
Namhyung Kim
maintainerPATCH 8/9 perf util: Get rid of die() calls in trace-data-read.c
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Convert them to pr_debug() and propagate error code.
--- tools/perf/util/trace-event-read.c | 44 +++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-)
tools/perf/util/trace-event-read.c +29 -15
@@ -132,17 +132,23 @@ static char *read_string(void)for (;;) { r =read (input_fd, &c,1 ); -if (r <0 ) -die ("reading input file" ); +if (r <0 ) { +pr_debug ("reading input file" ); + goto out; + } -if (!r) -die ("no data" ); +if (!r) { +pr_debug ("no data" ); + goto out; + }if (repipe) {int retw =write (STDOUT_FILENO , &c,1 ); -if (retw <=0 || retw != r) -die ("repiping input file string" ); +if (retw <=0 || retw != r) { +pr_debug ("repiping input file string" ); + goto out; + } } buf[size++] = c;
@@ -157,7 +163,7 @@ static char *read_string(void) str =malloc (size);if (str)memcpy (str, buf, size); - +out:return str; }
@@ -221,8 +227,10 @@ static int read_header_files(struct pevent *pevent)if (do_read (buf,12 ) <0 )return -1 ; -if (memcmp (buf,"header_page" ,12 ) !=0 ) -die ("did not read header page" ); +if (memcmp (buf,"header_page" ,12 ) !=0 ) { +pr_debug ("did not read header page" ); +return -1 ; + } size =read8 (pevent);skip (size);
@@ -236,8 +244,10 @@ static int read_header_files(struct pevent *pevent)if (do_read (buf,13 ) <0 )return -1 ; -if (memcmp (buf,"header_event" ,13 ) !=0 ) -die ("did not read header event" ); +if (memcmp (buf,"header_event" ,13 ) !=0 ) { +pr_debug ("did not read header event" ); +return -1 ; + } size =read8 (pevent); header_event =malloc (size);
@@ -355,13 +365,17 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)if (do_read (buf,3 ) <0 )return -1 ; -if (memcmp (buf, test,3 ) !=0 ) -die ("no trace data in the file" ); +if (memcmp (buf, test,3 ) !=0 ) { +pr_debug ("no trace data in the file" ); +return -1 ; + }if (do_read (buf,7 ) <0 )return -1 ; -if (memcmp (buf,"tracing" ,7 ) !=0 ) -die ("not a trace file (missing 'tracing' tag)" ); +if (memcmp (buf,"tracing" ,7 ) !=0 ) { +pr_debug ("not a trace file (missing 'tracing' tag)" ); +return -1 ; + } version =read_string ();if (version ==NULL )
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Get rid of die() calls in trace-data-read.c
perf tools: Get rid of die() calls in trace-data-read.c
Commit-ID: 452958fdd05b43b6c91cfd1341f4fac2f3ce661f Gitweb: http://git.kernel.org/tip/452958fdd05b43b6c91cfd1341f4fac2f3ce661f Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:51 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:37:13 -0300
perf tools: Get rid of die() calls in trace-data-read.c
Convert them to pr_debug() and propagate error code.
--- tools/perf/util/trace-event-read.c | 44 +++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-)
tools/perf/util/trace-event-read.c +29 -15
@@ -130,17 +130,23 @@ static char *read_string(void)for (;;) { r =read (input_fd, &c,1 ); -if (r <0 ) -die ("reading input file" ); +if (r <0 ) { +pr_debug ("reading input file" ); + goto out; + } -if (!r) -die ("no data" ); +if (!r) { +pr_debug ("no data" ); + goto out; + }if (repipe) {int retw =write (STDOUT_FILENO , &c,1 ); -if (retw <=0 || retw != r) -die ("repiping input file string" ); +if (retw <=0 || retw != r) { +pr_debug ("repiping input file string" ); + goto out; + } } buf[size++] = c;
@@ -155,7 +161,7 @@ static char *read_string(void) str =malloc (size);if (str)memcpy (str, buf, size); - +out:return str; }
@@ -219,8 +225,10 @@ static int read_header_files(struct pevent *pevent)if (do_read (buf,12 ) <0 )return -1 ; -if (memcmp (buf,"header_page" ,12 ) !=0 ) -die ("did not read header page" ); +if (memcmp (buf,"header_page" ,12 ) !=0 ) { +pr_debug ("did not read header page" ); +return -1 ; + } size =read8 (pevent);skip (size);
@@ -234,8 +242,10 @@ static int read_header_files(struct pevent *pevent)if (do_read (buf,13 ) <0 )return -1 ; -if (memcmp (buf,"header_event" ,13 ) !=0 ) -die ("did not read header event" ); +if (memcmp (buf,"header_event" ,13 ) !=0 ) { +pr_debug ("did not read header event" ); +return -1 ; + } size =read8 (pevent); header_event =malloc (size);
@@ -353,13 +363,17 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)if (do_read (buf,3 ) <0 )return -1 ; -if (memcmp (buf, test,3 ) !=0 ) -die ("no trace data in the file" ); +if (memcmp (buf, test,3 ) !=0 ) { +pr_debug ("no trace data in the file" ); +return -1 ; + }if (do_read (buf,7 ) <0 )return -1 ; -if (memcmp (buf,"tracing" ,7 ) !=0 ) -die ("not a trace file (missing 'tracing' tag)" ); +if (memcmp (buf,"tracing" ,7 ) !=0 ) { +pr_debug ("not a trace file (missing 'tracing' tag)" ); +return -1 ; + } version =read_string ();if (version ==NULL )
Namhyung Kim
maintainerPATCH 9/9 perf util: Cleanup calc_data_size logic
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
It's for calculating whole trace data size during reading. However relation functions are called only in this file, no need to conditionalize it with tricky +1 offset and rename the variable to more meaningful name like trace_data_size.
--- tools/perf/util/trace-event-read.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
tools/perf/util/trace-event-read.c +4 -9
@@ -45,7 +45,7 @@ int file_bigendian;int host_bigendian;static int long_size; -static ssize_t calc_data_size; +static ssize_t trace_data_size;static bool repipe;static int __do_read (int fd,void *buf,int size)
@@ -85,8 +85,7 @@ static int do_read(void *data, int size)return -1 ; } -if (calc_data_size) - calc_data_size += r; + trace_data_size += r;return r; }
@@ -157,8 +156,7 @@ static char *read_string(void)break ; } -if (calc_data_size) - calc_data_size += size; + trace_data_size += size; str =malloc (size);if (str)
@@ -358,9 +356,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) *ppevent =NULL ; - calc_data_size =1 ; repipe = __repipe; - input_fd = fd;if (do_read (buf,3 ) <0 )
@@ -419,8 +415,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)if (err) goto out; - size = calc_data_size -1 ; - calc_data_size =0 ; + size = trace_data_size; repipe = false;if (show_funcs) {
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Cleanup calc_data_size logic
perf tools: Cleanup calc_data_size logic
Commit-ID: ebf3c675d7e4ba97568dd6daaa43b1af10046b29 Gitweb: http://git.kernel.org/tip/ebf3c675d7e4ba97568dd6daaa43b1af10046b29 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 21 Mar 2013 16:18:52 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 21 Mar 2013 13:37:37 -0300
perf tools: Cleanup calc_data_size logic
It's for calculating whole trace data size during reading. However relation functions are called only in this file, no need to conditionalize it with tricky +1 offset and rename the variable to more meaningful name like trace_data_size.
--- tools/perf/util/trace-event-read.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
tools/perf/util/trace-event-read.c +4 -9
@@ -43,7 +43,7 @@ int file_bigendian;int host_bigendian;static int long_size; -static ssize_t calc_data_size; +static ssize_t trace_data_size;static bool repipe;static int __do_read (int fd,void *buf,int size)
@@ -83,8 +83,7 @@ static int do_read(void *data, int size)return -1 ; } -if (calc_data_size) - calc_data_size += r; + trace_data_size += r;return r; }
@@ -155,8 +154,7 @@ static char *read_string(void)break ; } -if (calc_data_size) - calc_data_size += size; + trace_data_size += size; str =malloc (size);if (str)
@@ -356,9 +354,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) *ppevent =NULL ; - calc_data_size =1 ; repipe = __repipe; - input_fd = fd;if (do_read (buf,3 ) <0 )
@@ -417,8 +413,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)if (err) goto out; - size = calc_data_size -1 ; - calc_data_size =0 ; + size = trace_data_size; repipe = false;if (show_funcs) {