tools lib traceevent: Get rid of die() from pretty_print()
PATCH 1/3 tools lib traceevent: Get rid of die() from pretty_print()
From: Namhyung Kim <[email protected]>
There are three cases that call die() in the pretty_print.
1. insufficient number of argument: cannot proceed anymore.
2. too long format conversion specifier: truncate and proceed.
3. bad size specifier in format string: skip and proceed.
For all cases, convert die to do_warning, mark the event as EVENT_FL_FAILED and print error message at the last.
--- tools/lib/traceevent/event-parse.c | 43 ++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-)
tools/lib/traceevent/event-parse.c +32 -11
@@ -3889,8 +3889,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event goto cont_process;case '*' :/* The argument is the length. */ -if (!arg) -die ("no argument match" ); +if (!arg) { +do_warning ("no argument match" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len_arg =eval_num_arg (data, size, event, arg); len_as_arg =1 ; arg = arg->next;
@@ -3923,15 +3926,21 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventcase 'x' :case 'X' :case 'u' : -if (!arg) -die ("no argument match" ); +if (!arg) { +do_warning ("no argument match" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len = ((unsigned long )ptr +1 ) - (unsigned long )saveptr;/* should never happen */ -if (len >31 ) -die ("bad format!" ); +if (len >31 ) { +do_warning ("bad format!" ); + event->flags |=EVENT_FL_FAILED ; + len =31 ; + }memcpy (format, saveptr, len); format[len] =0 ;
@@ -3995,19 +4004,26 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventtrace_seq_printf (s, format, (long long )val);break ;default : -die ("bad count (%d)" , ls); +do_warning ("bad count (%d)" , ls); + event->flags |=EVENT_FL_FAILED ; }break ;case 's' : -if (!arg) -die ("no matching argument" ); +if (!arg) { +do_warning ("no matching argument" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len = ((unsigned long )ptr +1 ) - (unsigned long )saveptr;/* should never happen */ -if (len >31 ) -die ("bad format!" ); +if (len >31 ) { +do_warning ("bad format!" ); + event->flags |=EVENT_FL_FAILED ; + len =31 ; + }memcpy (format, saveptr, len); format[len] =0 ;
@@ -4025,6 +4041,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventtrace_seq_putc (s, *ptr); } +if (event->flags &EVENT_FL_FAILED ) { +out_failed: +trace_seq_printf (s,"[FAILED TO PARSE]" ); + } +if (args) {free_args (args);free (bprint_fmt);
Signature · 1 line
1.7.11.4
PATCH 2/3 tools lib traceevent: Get rid of die() from pevent_register_event_handler
From: Namhyung Kim <[email protected]>
If memory allocation for handler fails, return gracefully instead of calling die(). Note that casts to void * are needed because gcc complained about discarding 'const' qualifier during implicit argument cast.
--- tools/lib/traceevent/event-parse.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +11 -2
@@ -5183,7 +5183,12 @@ int pevent_register_event_handler(struct pevent *pevent, not_found:/* Save for later use. */ - handle =malloc_or_die (sizeof (*handle)); + handle =malloc (sizeof (*handle)); +if (!handle) { +do_warning ("Failed to allocate event handler" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } +memset (handle,0 ,sizeof (*handle)); handle->id = id;if (event_name)
@@ -5193,7 +5198,11 @@ int pevent_register_event_handler(struct pevent *pevent,if ((event_name && !handle->event_name) || (sys_name && !handle->sys_name)) { -die ("Failed to allocate event/sys name" ); +do_warning ("Failed to allocate event/sys name" ); +free ((void *)handle->event_name); +free ((void *)handle->sys_name); +free (handle); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; } handle->func = func;
Signature · 1 line
1.7.11.4
[tip:perf/core] tools lib traceevent: Get rid of die() from pevent_register_event_handler
Commit-ID: 0ca8da00ad170c12c12350c3a2500591a7bec535 Gitweb: http://git.kernel.org/tip/0ca8da00ad170c12c12350c3a2500591a7bec535 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 7 Sep 2012 11:49:46 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 7 Sep 2012 12:15:07 -0300
tools lib traceevent: Get rid of die() from pevent_register_event_handler
If memory allocation for handler fails, return gracefully instead of calling die(). Note that casts to void * are needed because gcc complained about discarding 'const' qualifier during implicit argument cast.
--- tools/lib/traceevent/event-parse.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +11 -2
@@ -5183,7 +5183,12 @@ int pevent_register_event_handler(struct pevent *pevent, not_found:/* Save for later use. */ - handle =malloc_or_die (sizeof (*handle)); + handle =malloc (sizeof (*handle)); +if (!handle) { +do_warning ("Failed to allocate event handler" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } +memset (handle,0 ,sizeof (*handle)); handle->id = id;if (event_name)
@@ -5193,7 +5198,11 @@ int pevent_register_event_handler(struct pevent *pevent,if ((event_name && !handle->event_name) || (sys_name && !handle->sys_name)) { -die ("Failed to allocate event/sys name" ); +do_warning ("Failed to allocate event/sys name" ); +free ((void *)handle->event_name); +free ((void *)handle->sys_name); +free (handle); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; } handle->func = func;
PATCH 3/3 tools lib traceevent: Get rid of die() from pevent_register_print_function
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
If memory allocation for handler fails or argument type is not match, return gracefully instead of calling die(). Also add an new error code for the later case.
--- tools/lib/traceevent/event-parse.c | 26 ++++++++++++++++++++------ tools/lib/traceevent/event-parse.h | 3 ++- 2 files changed, 22 insertions(+), 7 deletions(-)
tools/lib/traceevent/event-parse.c +20 -6
@@ -5080,6 +5080,7 @@ int pevent_register_print_function(struct pevent *pevent,struct pevent_func_params *param;enum pevent_func_arg_type type;va_list ap; +int ret; func_handle =find_func_handler (pevent, name);if (func_handle) {
@@ -5092,14 +5093,21 @@ int pevent_register_print_function(struct pevent *pevent,remove_func_handler (pevent, name); } - func_handle =malloc_or_die (sizeof (*func_handle)); + func_handle =malloc (sizeof (*func_handle)); +if (!func_handle) { +do_warning ("Failed to allocate function handler" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }memset (func_handle,0 ,sizeof (*func_handle)); func_handle->ret_type = ret_type; func_handle->name =strdup (name); func_handle->func = func; -if (!func_handle->name) -die ("Failed to allocate function name" ); +if (!func_handle->name) { +do_warning ("Failed to allocate function name" ); +free (func_handle); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } next_param = &(func_handle->params);va_start (ap, name);
@@ -5109,11 +5117,17 @@ int pevent_register_print_function(struct pevent *pevent,break ;if (type <0 || type >=PEVENT_FUNC_ARG_MAX_TYPES ) { -warning ("Invalid argument type %d" , type); +do_warning ("Invalid argument type %d" , type); + ret =PEVENT_ERRNO__INVALID_ARG_TYPE ; goto out_free; } - param =malloc_or_die (sizeof (*param)); + param =malloc (sizeof (*param)); +if (!param) { +do_warning ("Failed to allocate function param" ); + ret =PEVENT_ERRNO__MEM_ALLOC_FAILED ; + goto out_free; + } param->type = type; param->next =NULL ;
@@ -5131,7 +5145,7 @@ int pevent_register_print_function(struct pevent *pevent, out_free:va_end (ap);free_func_handle (func_handle); -return -1 ; +return ret; }/**
tools/lib/traceevent/event-parse.h +2 -1
@@ -351,7 +351,8 @@ enum pevent_flag {_PE (READ_ID_FAILED ,"failed to read event id" ), \_PE (READ_FORMAT_FAILED ,"failed to read event format" ), \_PE (READ_PRINT_FAILED ,"failed to read event print fmt" ), \ - _PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace") +_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\ + _PE(INVALID_ARG_TYPE, "invalid argument type")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
Signature · 1 line
1.7.11.4
[tip:perf/core] tools lib traceevent: Get rid of die() from pevent_register_print_function
Commit-ID: 67ed939c9eb029c28057eb75de456a9d0e899fd4 Gitweb: http://git.kernel.org/tip/67ed939c9eb029c28057eb75de456a9d0e899fd4 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 7 Sep 2012 11:49:47 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 7 Sep 2012 12:15:31 -0300
tools lib traceevent: Get rid of die() from pevent_register_print_function
If memory allocation for handler fails or argument type is not match, return gracefully instead of calling die(). Also add an new error code for the later case.
--- tools/lib/traceevent/event-parse.c | 26 ++++++++++++++++++++------ tools/lib/traceevent/event-parse.h | 3 ++- 2 files changed, 22 insertions(+), 7 deletions(-)
tools/lib/traceevent/event-parse.c +20 -6
@@ -5080,6 +5080,7 @@ int pevent_register_print_function(struct pevent *pevent,struct pevent_func_params *param;enum pevent_func_arg_type type;va_list ap; +int ret; func_handle =find_func_handler (pevent, name);if (func_handle) {
@@ -5092,14 +5093,21 @@ int pevent_register_print_function(struct pevent *pevent,remove_func_handler (pevent, name); } - func_handle =malloc_or_die (sizeof (*func_handle)); + func_handle =malloc (sizeof (*func_handle)); +if (!func_handle) { +do_warning ("Failed to allocate function handler" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }memset (func_handle,0 ,sizeof (*func_handle)); func_handle->ret_type = ret_type; func_handle->name =strdup (name); func_handle->func = func; -if (!func_handle->name) -die ("Failed to allocate function name" ); +if (!func_handle->name) { +do_warning ("Failed to allocate function name" ); +free (func_handle); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } next_param = &(func_handle->params);va_start (ap, name);
@@ -5109,11 +5117,17 @@ int pevent_register_print_function(struct pevent *pevent,break ;if (type <0 || type >=PEVENT_FUNC_ARG_MAX_TYPES ) { -warning ("Invalid argument type %d" , type); +do_warning ("Invalid argument type %d" , type); + ret =PEVENT_ERRNO__INVALID_ARG_TYPE ; goto out_free; } - param =malloc_or_die (sizeof (*param)); + param =malloc (sizeof (*param)); +if (!param) { +do_warning ("Failed to allocate function param" ); + ret =PEVENT_ERRNO__MEM_ALLOC_FAILED ; + goto out_free; + } param->type = type; param->next =NULL ;
@@ -5131,7 +5145,7 @@ int pevent_register_print_function(struct pevent *pevent, out_free:va_end (ap);free_func_handle (func_handle); -return -1 ; +return ret; }/**
tools/lib/traceevent/event-parse.h +2 -1
@@ -351,7 +351,8 @@ enum pevent_flag {_PE (READ_ID_FAILED ,"failed to read event id" ), \_PE (READ_FORMAT_FAILED ,"failed to read event format" ), \_PE (READ_PRINT_FAILED ,"failed to read event print fmt" ), \ - _PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace") +_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\ + _PE(INVALID_ARG_TYPE, "invalid argument type")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
Quoted 8 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
There are three cases that call
die()in thepretty_print.1. insufficient number of argument: cannot proceed anymore.
2. too long format conversion specifier: truncate and proceed.
3. bad size specifier in format string: skip and proceed.
Quoted 6 lines
For all cases, convert die to
do_warning, mark the event asEVENT_FL_FAILEDand print error message at the last.Cc Frederic Weisbecker <[email protected]>Cc Steven Rostedt <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Thanks Namyung!
Arnaldo,
Please add my "Acked-by: Steven Rostedt <[email protected]>" to all three of these patches.
-- Steve
Commit-ID: 245c5a18433090da0e1a799bdb0faa78552b5992 Gitweb: http://git.kernel.org/tip/245c5a18433090da0e1a799bdb0faa78552b5992 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 7 Sep 2012 11:49:45 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 7 Sep 2012 12:14:30 -0300
tools lib traceevent: Get rid of die() from pretty_print()
There are three cases that call die() in the pretty_print.
1. insufficient number of argument: cannot proceed anymore.
2. too long format conversion specifier: truncate and proceed.
3. bad size specifier in format string: skip and proceed.
For all cases, convert die to do_warning, mark the event as EVENT_FL_FAILED and print error message at the last.
--- tools/lib/traceevent/event-parse.c | 43 ++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 11 deletions(-)
tools/lib/traceevent/event-parse.c +32 -11
@@ -3889,8 +3889,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event goto cont_process;case '*' :/* The argument is the length. */ -if (!arg) -die ("no argument match" ); +if (!arg) { +do_warning ("no argument match" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len_arg =eval_num_arg (data, size, event, arg); len_as_arg =1 ; arg = arg->next;
@@ -3923,15 +3926,21 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventcase 'x' :case 'X' :case 'u' : -if (!arg) -die ("no argument match" ); +if (!arg) { +do_warning ("no argument match" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len = ((unsigned long )ptr +1 ) - (unsigned long )saveptr;/* should never happen */ -if (len >31 ) -die ("bad format!" ); +if (len >31 ) { +do_warning ("bad format!" ); + event->flags |=EVENT_FL_FAILED ; + len =31 ; + }memcpy (format, saveptr, len); format[len] =0 ;
@@ -3995,19 +4004,26 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventtrace_seq_printf (s, format, (long long )val);break ;default : -die ("bad count (%d)" , ls); +do_warning ("bad count (%d)" , ls); + event->flags |=EVENT_FL_FAILED ; }break ;case 's' : -if (!arg) -die ("no matching argument" ); +if (!arg) { +do_warning ("no matching argument" ); + event->flags |=EVENT_FL_FAILED ; + goto out_failed; + } len = ((unsigned long )ptr +1 ) - (unsigned long )saveptr;/* should never happen */ -if (len >31 ) -die ("bad format!" ); +if (len >31 ) { +do_warning ("bad format!" ); + event->flags |=EVENT_FL_FAILED ; + len =31 ; + }memcpy (format, saveptr, len); format[len] =0 ;
@@ -4025,6 +4041,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct eventtrace_seq_putc (s, *ptr); } +if (event->flags &EVENT_FL_FAILED ) { +out_failed: +trace_seq_printf (s,"[FAILED TO PARSE]" ); + } +if (args) {free_args (args);free (bprint_fmt);