tools lib traceevent: Get rid of *die() calls from parse-filter.c (v2)
cover tools lib traceevent: Get rid of *die() calls from parse-filter.c (v2)
Hello,
This patchset tries to remove all die() calls in event filter parsing code. I changed two main functions of pevent_filter_add_filter_str() and pevent_filter_match() to return a proper error code (pevent_errno).
The actual error message might be saved in a static buffer in pevent_ filter and it can be accessed by new pevent_filter_strerror() function. The old pevent_strerror() still works for them too.
The only remaining bits are in trace-seq.c which implement print functions and I want to hear what's the best way we can handle the error case during the print.
I also put this patches on libtraceevent/die-removal-v2 branch in my tree
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Any comments are welcome, thanks
Namhyung
Namhyung Kim (14):
tools lib traceevent: Get rid of malloc_or_die() in show_error() tools lib traceevent: Get rid of die in add_filter_type() tools lib traceevent: Get rid of malloc_or_die() allocate_arg() tools lib traceevent: Get rid of malloc_or_die() in read_token() tools lib traceevent: Get rid of malloc_or_die() in find_event() tools lib traceevent: Get rid of die() in add_right() tools lib traceevent: Make add_left() return pevent_errno tools lib traceevent: Get rid of die() in reparent_op_arg() tools lib traceevent: Refactor create_arg_item()
tools lib traceevent: Refactor process_filter()
tools lib traceevent: Make pevent_filter_add_filter_str() return
pevent_errno
tools lib traceevent: Refactor pevent_filter_match() to get rid of
die()
tools lib traceevent: Get rid of die() in some string conversion
funcitons
tools lib traceevent: Introduce pevent_filter_strerror()
tools/lib/traceevent/event-parse.c | 17 +- tools/lib/traceevent/event-parse.h | 48 ++- tools/lib/traceevent/parse-filter.c | 615 ++++++++++++++++++++++-------------- 3 files changed, 417 insertions(+), 263 deletions(-)
Signature · 1 line
1.7.11.7
PATCH 1/14 tools lib traceevent: Get rid of malloc_or_die() in show_error()
--- tools/lib/traceevent/parse-filter.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
tools/lib/traceevent/parse-filter.c +15 -1
@@ -56,7 +56,21 @@ static void show_error(char **error_str, const char *fmt, ...) index =pevent_get_input_buf_ptr (); len = input ?strlen (input) :0 ; - error =malloc_or_die (MAX_ERR_STR_SIZE + (len*2 ) +3 ); + error =malloc (MAX_ERR_STR_SIZE + (len*2 ) +3 ); +if (error ==NULL ) { +/* +* Maybe it's due to len is too long. +* Retry without the input buffer part. +*/ + len =0 ; + + error =malloc (MAX_ERR_STR_SIZE ); +if (error ==NULL ) { +/* no memory */ + *error_str =NULL ; +return ; + } + }if (len) {strcpy (error, input);
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of malloc_or_die() in show_error()
tools lib traceevent: Get rid of malloc_or_die() in show_error()
Commit-ID: 9451a2fd78c785445afe0f6966b2043c3ee187ca Gitweb: http://git.kernel.org/tip/9451a2fd78c785445afe0f6966b2043c3ee187ca Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:04 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:21 -0300
tools lib traceevent: Get rid of malloc_or_die() in show_error()
--- tools/lib/traceevent/parse-filter.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
tools/lib/traceevent/parse-filter.c +15 -1
@@ -56,7 +56,21 @@ static void show_error(char **error_str, const char *fmt, ...) index =pevent_get_input_buf_ptr (); len = input ?strlen (input) :0 ; - error =malloc_or_die (MAX_ERR_STR_SIZE + (len*2 ) +3 ); + error =malloc (MAX_ERR_STR_SIZE + (len*2 ) +3 ); +if (error ==NULL ) { +/* +* Maybe it's due to len is too long. +* Retry without the input buffer part. +*/ + len =0 ; + + error =malloc (MAX_ERR_STR_SIZE ); +if (error ==NULL ) { +/* no memory */ + *error_str =NULL ; +return ; + } + }if (len) {strcpy (error, input);
PATCH 2/14 tools lib traceevent: Get rid of die in add_filter_type()
In reply to Namhyung KimThe realloc() should check return value and not to overwrite previous pointer in case of error.
--- tools/lib/traceevent/parse-filter.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
tools/lib/traceevent/parse-filter.c +16 -5
@@ -161,11 +161,13 @@ add_filter_type(struct event_filter *filter, int id)if (filter_type)return filter_type; - filter->event_filters =realloc (filter->event_filters, -sizeof (*filter->event_filters) * - (filter->filters +1 )); -if (!filter->event_filters) -die ("Could not allocate filter" ); + filter_type =realloc (filter->event_filters, +sizeof (*filter->event_filters) * + (filter->filters +1 )); +if (!filter_type) +return NULL ; + + filter->event_filters = filter_type;for (i =0 ; i < filter->filters; i++) {if (filter->event_filters[i].event_id > id)
@@ -1180,6 +1182,12 @@ static int filter_event(struct event_filter *filter, } filter_type =add_filter_type (filter, event->id); +if (filter_type ==NULL ) { +show_error (error_str,"failed to add a new filter: %s" , + filter_str ? filter_str :"true" ); +return -1 ; + } +if (filter_type->filter)free_arg (filter_type->filter); filter_type->filter = arg;
@@ -1417,6 +1425,9 @@ static int copy_filter_type(struct event_filter *filter, arg->boolean.value =0 ; filter_type =add_filter_type (filter, event->id); +if (filter_type ==NULL ) +return -1 ; + filter_type->filter = arg;free (str);
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of die in add_filter_type()
tools lib traceevent: Get rid of die in add_filter_type()
Commit-ID: ef3072cd1d5c2ea229f7abf8d6475e0c200eeb71 Gitweb: http://git.kernel.org/tip/ef3072cd1d5c2ea229f7abf8d6475e0c200eeb71 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:05 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:21 -0300
tools lib traceevent: Get rid of die in add_filter_type()
The realloc() should check return value and not to overwrite previous pointer in case of error.
--- tools/lib/traceevent/parse-filter.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
tools/lib/traceevent/parse-filter.c +16 -5
@@ -161,11 +161,13 @@ add_filter_type(struct event_filter *filter, int id)if (filter_type)return filter_type; - filter->event_filters =realloc (filter->event_filters, -sizeof (*filter->event_filters) * - (filter->filters +1 )); -if (!filter->event_filters) -die ("Could not allocate filter" ); + filter_type =realloc (filter->event_filters, +sizeof (*filter->event_filters) * + (filter->filters +1 )); +if (!filter_type) +return NULL ; + + filter->event_filters = filter_type;for (i =0 ; i < filter->filters; i++) {if (filter->event_filters[i].event_id > id)
@@ -1180,6 +1182,12 @@ static int filter_event(struct event_filter *filter, } filter_type =add_filter_type (filter, event->id); +if (filter_type ==NULL ) { +show_error (error_str,"failed to add a new filter: %s" , + filter_str ? filter_str :"true" ); +return -1 ; + } +if (filter_type->filter)free_arg (filter_type->filter); filter_type->filter = arg;
@@ -1417,6 +1425,9 @@ static int copy_filter_type(struct event_filter *filter, arg->boolean.value =0 ; filter_type =add_filter_type (filter, event->id); +if (filter_type ==NULL ) +return -1 ; + filter_type->filter = arg;free (str);
PATCH 3/14 tools lib traceevent: Get rid of malloc_or_die() allocate_arg()
In reply to Namhyung KimAlso check return value and handle it.
--- tools/lib/traceevent/parse-filter.c | 48 ++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-)
tools/lib/traceevent/parse-filter.c +40 -8
@@ -211,12 +211,7 @@ struct event_filter *pevent_filter_alloc(struct pevent *pevent)static struct filter_arg *allocate_arg (void ) { -struct filter_arg *arg; - - arg =malloc_or_die (sizeof (*arg)); -memset (arg,0 ,sizeof (*arg)); - -return arg; +return calloc (1 ,sizeof (struct filter_arg )); }static void free_arg (struct filter_arg *arg)
@@ -369,6 +364,10 @@ create_arg_item(struct event_format *event, const char *token,struct filter_arg *arg; arg =allocate_arg (); +if (arg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return NULL ; + }switch (type) {
@@ -422,6 +421,9 @@ create_arg_op(enum filter_op_type btype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; + arg->type =FILTER_ARG_OP ; arg->op.type = btype;
@@ -434,6 +436,9 @@ create_arg_exp(enum filter_exp_type etype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; + arg->type =FILTER_ARG_EXP ; arg->op.type = etype;
@@ -446,6 +451,9 @@ create_arg_cmp(enum filter_exp_type etype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; +/* Use NUM and change if necessary */ arg->type =FILTER_ARG_NUM ; arg->op.type = etype;
@@ -909,8 +917,10 @@ static struct filter_arg *collapse_tree(struct filter_arg *arg)case FILTER_VAL_FALSE :free_arg (arg); arg =allocate_arg (); - arg->type =FILTER_ARG_BOOLEAN ; - arg->boolean.value = ret ==FILTER_VAL_TRUE ; +if (arg) { + arg->type =FILTER_ARG_BOOLEAN ; + arg->boolean.value = ret ==FILTER_VAL_TRUE ; + } }return arg;
@@ -1057,6 +1067,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,switch (op_type) {case OP_BOOL : arg =create_arg_op (btype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_left (arg, current_op);else
@@ -1067,6 +1079,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,case OP_NOT : arg =create_arg_op (btype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_right (current_op, arg, error_str);if (ret <0 )
@@ -1086,6 +1100,8 @@ process_filter(struct event_format *event, struct filter_arg **parg, arg =create_arg_exp (etype); else arg =create_arg_cmp (ctype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_right (current_op, arg, error_str);
@@ -1119,11 +1135,16 @@ process_filter(struct event_format *event, struct filter_arg **parg, current_op = current_exp; current_op =collapse_tree (current_op); +if (current_op ==NULL ) + goto fail_alloc; *parg = current_op;return 0 ; + fail_alloc: +show_error (error_str,"failed to allocate filter arg" ); + goto fail; fail_print:show_error (error_str,"Syntax error" ); fail:
@@ -1154,6 +1175,10 @@ process_event(struct event_format *event, const char *filter_str,/* If parg is NULL, then make it into FALSE */ if (!*parg) { *parg =allocate_arg (); +if (*parg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return -1 ; + } (*parg)->type =FILTER_ARG_BOOLEAN ; (*parg)->boolean.value =FILTER_FALSE ; }
@@ -1177,6 +1202,10 @@ static int filter_event(struct event_filter *filter, }else {/* just add a TRUE arg */ arg =allocate_arg (); +if (arg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return -1 ; + } arg->type =FILTER_ARG_BOOLEAN ; arg->boolean.value =FILTER_TRUE ; }
@@ -1418,6 +1447,9 @@ static int copy_filter_type(struct event_filter *filter,if (strcmp (str,"TRUE" ) ==0 ||strcmp (str,"FALSE" ) ==0 ) {/* Add trivial event */ arg =allocate_arg (); +if (arg ==NULL ) +return -1 ; + arg->type =FILTER_ARG_BOOLEAN ;if (strcmp (str,"TRUE" ) ==0 ) arg->boolean.value =1 ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of malloc_or_die() allocate_arg()
tools lib traceevent: Get rid of malloc_or_die() allocate_arg()
Commit-ID: 2e4eb10d7e59df71ab649343b3f1bff9259da15d Gitweb: http://git.kernel.org/tip/2e4eb10d7e59df71ab649343b3f1bff9259da15d Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:06 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:21 -0300
tools lib traceevent: Get rid of malloc_or_die() allocate_arg()
Also check return value and handle it.
--- tools/lib/traceevent/parse-filter.c | 48 ++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-)
tools/lib/traceevent/parse-filter.c +40 -8
@@ -211,12 +211,7 @@ struct event_filter *pevent_filter_alloc(struct pevent *pevent)static struct filter_arg *allocate_arg (void ) { -struct filter_arg *arg; - - arg =malloc_or_die (sizeof (*arg)); -memset (arg,0 ,sizeof (*arg)); - -return arg; +return calloc (1 ,sizeof (struct filter_arg )); }static void free_arg (struct filter_arg *arg)
@@ -369,6 +364,10 @@ create_arg_item(struct event_format *event, const char *token,struct filter_arg *arg; arg =allocate_arg (); +if (arg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return NULL ; + }switch (type) {
@@ -422,6 +421,9 @@ create_arg_op(enum filter_op_type btype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; + arg->type =FILTER_ARG_OP ; arg->op.type = btype;
@@ -434,6 +436,9 @@ create_arg_exp(enum filter_exp_type etype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; + arg->type =FILTER_ARG_EXP ; arg->op.type = etype;
@@ -446,6 +451,9 @@ create_arg_cmp(enum filter_exp_type etype)struct filter_arg *arg; arg =allocate_arg (); +if (!arg) +return NULL ; +/* Use NUM and change if necessary */ arg->type =FILTER_ARG_NUM ; arg->op.type = etype;
@@ -909,8 +917,10 @@ static struct filter_arg *collapse_tree(struct filter_arg *arg)case FILTER_VAL_FALSE :free_arg (arg); arg =allocate_arg (); - arg->type =FILTER_ARG_BOOLEAN ; - arg->boolean.value = ret ==FILTER_VAL_TRUE ; +if (arg) { + arg->type =FILTER_ARG_BOOLEAN ; + arg->boolean.value = ret ==FILTER_VAL_TRUE ; + } }return arg;
@@ -1057,6 +1067,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,switch (op_type) {case OP_BOOL : arg =create_arg_op (btype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_left (arg, current_op);else
@@ -1067,6 +1079,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,case OP_NOT : arg =create_arg_op (btype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_right (current_op, arg, error_str);if (ret <0 )
@@ -1086,6 +1100,8 @@ process_filter(struct event_format *event, struct filter_arg **parg, arg =create_arg_exp (etype); else arg =create_arg_cmp (ctype); +if (arg ==NULL ) + goto fail_alloc;if (current_op) ret =add_right (current_op, arg, error_str);
@@ -1119,11 +1135,16 @@ process_filter(struct event_format *event, struct filter_arg **parg, current_op = current_exp; current_op =collapse_tree (current_op); +if (current_op ==NULL ) + goto fail_alloc; *parg = current_op;return 0 ; + fail_alloc: +show_error (error_str,"failed to allocate filter arg" ); + goto fail; fail_print:show_error (error_str,"Syntax error" ); fail:
@@ -1154,6 +1175,10 @@ process_event(struct event_format *event, const char *filter_str,/* If parg is NULL, then make it into FALSE */ if (!*parg) { *parg =allocate_arg (); +if (*parg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return -1 ; + } (*parg)->type =FILTER_ARG_BOOLEAN ; (*parg)->boolean.value =FILTER_FALSE ; }
@@ -1177,6 +1202,10 @@ static int filter_event(struct event_filter *filter, }else {/* just add a TRUE arg */ arg =allocate_arg (); +if (arg ==NULL ) { +show_error (error_str,"failed to allocate filter arg" ); +return -1 ; + } arg->type =FILTER_ARG_BOOLEAN ; arg->boolean.value =FILTER_TRUE ; }
@@ -1418,6 +1447,9 @@ static int copy_filter_type(struct event_filter *filter,if (strcmp (str,"TRUE" ) ==0 ||strcmp (str,"FALSE" ) ==0 ) {/* Add trivial event */ arg =allocate_arg (); +if (arg ==NULL ) +return -1 ; + arg->type =FILTER_ARG_BOOLEAN ;if (strcmp (str,"TRUE" ) ==0 ) arg->boolean.value =1 ;
PATCH 4/14 tools lib traceevent: Get rid of malloc_or_die() in read_token()
In reply to Namhyung Kim--- tools/lib/traceevent/parse-filter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/traceevent/parse-filter.c +7 -1
@@ -109,7 +109,11 @@ static enum event_type read_token(char **tok) (strcmp (token,"=" ) ==0 ||strcmp (token,"!" ) ==0 ) && pevent_peek_char() == '~') {/* append it */ - *tok =malloc_or_die (3 ); + *tok =malloc (3 ); +if (*tok ==NULL ) { +free_token (token); +return EVENT_ERROR ; + }sprintf (*tok,"%c%c" , *token,'~' );free_token (token);/* Now remove the '~' from the buffer */
@@ -1123,6 +1127,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,break ;case EVENT_NONE :break ; +case EVENT_ERROR : + goto fail_alloc;default : goto fail_print; }
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of malloc_or_die() in read_token()
tools lib traceevent: Get rid of malloc_or_die() in read_token()
Commit-ID: 91dfa49bdd8ef9600d850ef68ec892eb70824e3d Gitweb: http://git.kernel.org/tip/91dfa49bdd8ef9600d850ef68ec892eb70824e3d Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:07 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:21 -0300
tools lib traceevent: Get rid of malloc_or_die() in read_token()
--- tools/lib/traceevent/parse-filter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/traceevent/parse-filter.c +7 -1
@@ -109,7 +109,11 @@ static enum event_type read_token(char **tok) (strcmp (token,"=" ) ==0 ||strcmp (token,"!" ) ==0 ) && pevent_peek_char() == '~') {/* append it */ - *tok =malloc_or_die (3 ); + *tok =malloc (3 ); +if (*tok ==NULL ) { +free_token (token); +return EVENT_ERROR ; + }sprintf (*tok,"%c%c" , *token,'~' );free_token (token);/* Now remove the '~' from the buffer */
@@ -1123,6 +1127,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,break ;case EVENT_NONE :break ; +case EVENT_ERROR : + goto fail_alloc;default : goto fail_print; }
PATCH 5/14 tools lib traceevent: Get rid of malloc_or_die() in find_event()
In reply to Namhyung KimMake it return pevent_errno to distinguish malloc allocation failure. Since it'll be returned to user later, add more error code.
--- tools/lib/traceevent/event-parse.h | 4 +++- tools/lib/traceevent/parse-filter.c | 27 +++++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-)
tools/lib/traceevent/event-parse.h +3 -1
@@ -356,7 +356,9 @@ enum pevent_flag {_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(INVALID_ARG_TYPE, "invalid argument type") +_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \ +_PE (INVALID_EVENT_NAME ,"invalid event name" ), \ + _PE(EVENT_NOT_FOUND, "No event found") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +19 -8
@@ -287,7 +287,7 @@ static int event_match(struct event_format *event, !regexec (ereg, event->name,0 ,NULL ,0 ); } -static int +static enum pevent_errno find_event (struct pevent *pevent,struct event_list **events,char *sys_name,char *event_name) {
@@ -306,23 +306,31 @@ find_event(struct pevent *pevent, struct event_list **events, sys_name =NULL ; } - reg =malloc_or_die (strlen (event_name) +3 ); + reg =malloc (strlen (event_name) +3 ); +if (reg ==NULL ) +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; +sprintf (reg,"^%s$" , event_name); ret =regcomp (&ereg, reg,REG_ICASE |REG_NOSUB );free (reg);if (ret) -return -1 ; +return PEVENT_ERRNO__INVALID_EVENT_NAME ;if (sys_name) { - reg =malloc_or_die (strlen (sys_name) +3 ); + reg =malloc (strlen (sys_name) +3 ); +if (reg ==NULL ) { +regfree (&ereg); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } +sprintf (reg,"^%s$" , sys_name); ret =regcomp (&sreg, reg,REG_ICASE |REG_NOSUB );free (reg);if (ret) {regfree (&ereg); -return -1 ; +return PEVENT_ERRNO__INVALID_EVENT_NAME ; } }
@@ -342,9 +350,9 @@ find_event(struct pevent *pevent, struct event_list **events,regfree (&sreg);if (!match) -return -1 ; +return PEVENT_ERRNO__EVENT_NOT_FOUND ;if (fail) -return -2 ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ;return 0 ; }
@@ -1312,7 +1320,10 @@ int pevent_filter_add_filter_str(struct event_filter *filter,/* Find this event */ ret =find_event (pevent, &events,strim (sys_name),strim (event_name));if (ret <0 ) { -if (event_name) +if (ret ==PEVENT_ERRNO__MEM_ALLOC_FAILED ) +show_error (error_str, +"Memory allocation failure" ); +else if (event_name)show_error (error_str,"No event found under '%s.%s'" , sys_name, event_name);
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of malloc_or_die() in find_event()
tools lib traceevent: Get rid of malloc_or_die() in find_event()
Commit-ID: 605b8fda958a578e0a50ed1df3cac5a12f1fe8dc Gitweb: http://git.kernel.org/tip/605b8fda958a578e0a50ed1df3cac5a12f1fe8dc Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:08 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Get rid of malloc_or_die() in find_event()
Make it return pevent_errno to distinguish malloc allocation failure. Since it'll be returned to user later, add more error code.
--- tools/lib/traceevent/event-parse.h | 4 +++- tools/lib/traceevent/parse-filter.c | 27 +++++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-)
tools/lib/traceevent/event-parse.h +3 -1
@@ -356,7 +356,9 @@ enum pevent_flag {_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(INVALID_ARG_TYPE, "invalid argument type") +_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \ +_PE (INVALID_EVENT_NAME ,"invalid event name" ), \ + _PE(EVENT_NOT_FOUND, "No event found") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +19 -8
@@ -287,7 +287,7 @@ static int event_match(struct event_format *event, !regexec (ereg, event->name,0 ,NULL ,0 ); } -static int +static enum pevent_errno find_event (struct pevent *pevent,struct event_list **events,char *sys_name,char *event_name) {
@@ -306,23 +306,31 @@ find_event(struct pevent *pevent, struct event_list **events, sys_name =NULL ; } - reg =malloc_or_die (strlen (event_name) +3 ); + reg =malloc (strlen (event_name) +3 ); +if (reg ==NULL ) +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; +sprintf (reg,"^%s$" , event_name); ret =regcomp (&ereg, reg,REG_ICASE |REG_NOSUB );free (reg);if (ret) -return -1 ; +return PEVENT_ERRNO__INVALID_EVENT_NAME ;if (sys_name) { - reg =malloc_or_die (strlen (sys_name) +3 ); + reg =malloc (strlen (sys_name) +3 ); +if (reg ==NULL ) { +regfree (&ereg); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + } +sprintf (reg,"^%s$" , sys_name); ret =regcomp (&sreg, reg,REG_ICASE |REG_NOSUB );free (reg);if (ret) {regfree (&ereg); -return -1 ; +return PEVENT_ERRNO__INVALID_EVENT_NAME ; } }
@@ -342,9 +350,9 @@ find_event(struct pevent *pevent, struct event_list **events,regfree (&sreg);if (!match) -return -1 ; +return PEVENT_ERRNO__EVENT_NOT_FOUND ;if (fail) -return -2 ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ;return 0 ; }
@@ -1312,7 +1320,10 @@ int pevent_filter_add_filter_str(struct event_filter *filter,/* Find this event */ ret =find_event (pevent, &events,strim (sys_name),strim (event_name));if (ret <0 ) { -if (event_name) +if (ret ==PEVENT_ERRNO__MEM_ALLOC_FAILED ) +show_error (error_str, +"Memory allocation failure" ); +else if (event_name)show_error (error_str,"No event found under '%s.%s'" , sys_name, event_name);
PATCH 6/14 tools lib traceevent: Get rid of die() in add_right()
In reply to Namhyung KimRefactor it to return appropriate pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 8 +++++++- tools/lib/traceevent/parse-filter.c | 34 +++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 16 deletions(-)
tools/lib/traceevent/event-parse.h +7 -1
@@ -358,7 +358,13 @@ enum pevent_flag {_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \_PE (INVALID_EVENT_NAME ,"invalid event name" ), \ - _PE(EVENT_NOT_FOUND, "No event found") +_PE (EVENT_NOT_FOUND ,"no event found" ), \ +_PE (SYNTAX_ERROR ,"syntax error" ), \ +_PE (ILLEGAL_RVALUE ,"illegal rvalue" ), \ +_PE (ILLEGAL_LVALUE ,"illegal lvalue for string comparison" ), \ +_PE (INVALID_REGEX ,"regex did not compute" ), \ +_PE (ILLEGAL_STRING_CMP ,"illegal comparison for string" ), \ + _PE(ILLEGAL_INTEGER_CMP,"illegal comparison for integer") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +19 -15
@@ -473,8 +473,8 @@ create_arg_cmp(enum filter_exp_type etype)return arg; } -static int add_right (struct filter_arg *op,struct filter_arg *arg, -char **error_str) +static enum pevent_errno +add_right (struct filter_arg *op,struct filter_arg *arg,char **error_str) {struct filter_arg *left;char *str;
@@ -505,9 +505,8 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,case FILTER_ARG_FIELD :break ;default : -show_error (error_str, -"Illegal rvalue" ); -return -1 ; +show_error (error_str,"Illegal rvalue" ); +return PEVENT_ERRNO__ILLEGAL_RVALUE ; }/*
@@ -554,7 +553,7 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,if (left->type !=FILTER_ARG_FIELD ) {show_error (error_str,"Illegal lvalue for string comparison" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_LVALUE ; }/* Make sure this is a valid string compare */
@@ -573,25 +572,31 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,show_error (error_str,"RegEx '%s' did not compute" , str); -return -1 ; +return PEVENT_ERRNO__INVALID_REGEX ; }break ;default :show_error (error_str,"Illegal comparison for string" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_STRING_CMP ; } op->type =FILTER_ARG_STR ; op->str.type = op_type; op->str.field = left->field.field; op->str.val =strdup (str); -if (!op->str.val) -die ("malloc string" ); +if (!op->str.val) { +show_error (error_str,"Failed to allocate string filter" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }/* * Need a buffer to copy data for tests */ - op->str.buffer =malloc_or_die (op->str.field->size +1 ); + op->str.buffer =malloc (op->str.field->size +1 ); +if (!op->str.buffer) { +show_error (error_str,"Failed to allocate string filter" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }/* Null terminate this buffer */ op->str.buffer[op->str.field->size] =0 ;
@@ -609,7 +614,7 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,case FILTER_CMP_NOT_REGEX :show_error (error_str,"Op not allowed with integers" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_INTEGER_CMP ;default :break ;
@@ -629,9 +634,8 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,return 0 ; out_fail: -show_error (error_str, -"Syntax error" ); -return -1 ; +show_error (error_str,"Syntax error" ); +return PEVENT_ERRNO__SYNTAX_ERROR ; } static struct filter_arg *
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of die() in add_right()
tools lib traceevent: Get rid of die() in add_right()
Commit-ID: 02d62d6d17b9b718be2878477cdcae95df0d5b4e Gitweb: http://git.kernel.org/tip/02d62d6d17b9b718be2878477cdcae95df0d5b4e Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:09 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Get rid of die() in add_right()
Refactor it to return appropriate pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 8 +++++++- tools/lib/traceevent/parse-filter.c | 34 +++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 16 deletions(-)
tools/lib/traceevent/event-parse.h +7 -1
@@ -358,7 +358,13 @@ enum pevent_flag {_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \_PE (INVALID_EVENT_NAME ,"invalid event name" ), \ - _PE(EVENT_NOT_FOUND, "No event found") +_PE (EVENT_NOT_FOUND ,"no event found" ), \ +_PE (SYNTAX_ERROR ,"syntax error" ), \ +_PE (ILLEGAL_RVALUE ,"illegal rvalue" ), \ +_PE (ILLEGAL_LVALUE ,"illegal lvalue for string comparison" ), \ +_PE (INVALID_REGEX ,"regex did not compute" ), \ +_PE (ILLEGAL_STRING_CMP ,"illegal comparison for string" ), \ + _PE(ILLEGAL_INTEGER_CMP,"illegal comparison for integer") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +19 -15
@@ -473,8 +473,8 @@ create_arg_cmp(enum filter_exp_type etype)return arg; } -static int add_right (struct filter_arg *op,struct filter_arg *arg, -char **error_str) +static enum pevent_errno +add_right (struct filter_arg *op,struct filter_arg *arg,char **error_str) {struct filter_arg *left;char *str;
@@ -505,9 +505,8 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,case FILTER_ARG_FIELD :break ;default : -show_error (error_str, -"Illegal rvalue" ); -return -1 ; +show_error (error_str,"Illegal rvalue" ); +return PEVENT_ERRNO__ILLEGAL_RVALUE ; }/*
@@ -554,7 +553,7 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,if (left->type !=FILTER_ARG_FIELD ) {show_error (error_str,"Illegal lvalue for string comparison" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_LVALUE ; }/* Make sure this is a valid string compare */
@@ -573,25 +572,31 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,show_error (error_str,"RegEx '%s' did not compute" , str); -return -1 ; +return PEVENT_ERRNO__INVALID_REGEX ; }break ;default :show_error (error_str,"Illegal comparison for string" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_STRING_CMP ; } op->type =FILTER_ARG_STR ; op->str.type = op_type; op->str.field = left->field.field; op->str.val =strdup (str); -if (!op->str.val) -die ("malloc string" ); +if (!op->str.val) { +show_error (error_str,"Failed to allocate string filter" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }/* * Need a buffer to copy data for tests */ - op->str.buffer =malloc_or_die (op->str.field->size +1 ); + op->str.buffer =malloc (op->str.field->size +1 ); +if (!op->str.buffer) { +show_error (error_str,"Failed to allocate string filter" ); +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; + }/* Null terminate this buffer */ op->str.buffer[op->str.field->size] =0 ;
@@ -609,7 +614,7 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,case FILTER_CMP_NOT_REGEX :show_error (error_str,"Op not allowed with integers" ); -return -1 ; +return PEVENT_ERRNO__ILLEGAL_INTEGER_CMP ;default :break ;
@@ -629,9 +634,8 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg,return 0 ; out_fail: -show_error (error_str, -"Syntax error" ); -return -1 ; +show_error (error_str,"Syntax error" ); +return PEVENT_ERRNO__SYNTAX_ERROR ; } static struct filter_arg *
PATCH 7/14 tools lib traceevent: Make add_left() return pevent_errno
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
So that it can propagate error properly.
--- tools/lib/traceevent/parse-filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/lib/traceevent/parse-filter.c +3 -3
@@ -648,7 +648,7 @@ rotate_op_right(struct filter_arg *a, struct filter_arg *b)return arg; } -static int add_left (struct filter_arg *op,struct filter_arg *arg) +static enum pevent_errno add_left (struct filter_arg *op,struct filter_arg *arg) {switch (op->type) {case FILTER_ARG_EXP :
@@ -667,11 +667,11 @@ static int add_left(struct filter_arg *op, struct filter_arg *arg)/* left arg of compares must be a field */ if (arg->type !=FILTER_ARG_FIELD && arg->type !=FILTER_ARG_BOOLEAN ) -return -1 ; +return PEVENT_ERRNO__INVALID_ARG_TYPE ; op->num.left = arg;break ;default : -return -1 ; +return PEVENT_ERRNO__INVALID_ARG_TYPE ; }return 0 ; }
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Make add_left() return pevent_errno
tools lib traceevent: Make add_left() return pevent_errno
Commit-ID: ff533fc058975579dffbb62a731f63911ae714be Gitweb: http://git.kernel.org/tip/ff533fc058975579dffbb62a731f63911ae714be Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:10 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Make add_left() return pevent_errno
So that it can propagate error properly.
--- tools/lib/traceevent/parse-filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/lib/traceevent/parse-filter.c +3 -3
@@ -648,7 +648,7 @@ rotate_op_right(struct filter_arg *a, struct filter_arg *b)return arg; } -static int add_left (struct filter_arg *op,struct filter_arg *arg) +static enum pevent_errno add_left (struct filter_arg *op,struct filter_arg *arg) {switch (op->type) {case FILTER_ARG_EXP :
@@ -667,11 +667,11 @@ static int add_left(struct filter_arg *op, struct filter_arg *arg)/* left arg of compares must be a field */ if (arg->type !=FILTER_ARG_FIELD && arg->type !=FILTER_ARG_BOOLEAN ) -return -1 ; +return PEVENT_ERRNO__INVALID_ARG_TYPE ; op->num.left = arg;break ;default : -return -1 ; +return PEVENT_ERRNO__INVALID_ARG_TYPE ; }return 0 ; }
PATCH 8/14 tools lib traceevent: Get rid of die() in reparent_op_arg()
In reply to Namhyung KimTo do that, make the function returns the error code. Also pass error_str so that it can set proper error message when error occurred.
--- tools/lib/traceevent/event-parse.h | 5 +- tools/lib/traceevent/parse-filter.c | 94 +++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 35 deletions(-)
tools/lib/traceevent/event-parse.h +4 -1
@@ -364,7 +364,10 @@ enum pevent_flag {_PE (ILLEGAL_LVALUE ,"illegal lvalue for string comparison" ), \_PE (INVALID_REGEX ,"regex did not compute" ), \_PE (ILLEGAL_STRING_CMP ,"illegal comparison for string" ), \ - _PE(ILLEGAL_INTEGER_CMP,"illegal comparison for integer") +_PE (ILLEGAL_INTEGER_CMP ,"illegal comparison for integer" ), \ +_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \ +_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \ + _PE(BAD_FILTER_ARG, "bad arg in filter tree") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +60 -34
211 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of die() in reparent_op_arg()
tools lib traceevent: Get rid of die() in reparent_op_arg()
Commit-ID: 7bb73553e2490ac6667387ee723e0faa61e9d999 Gitweb: http://git.kernel.org/tip/7bb73553e2490ac6667387ee723e0faa61e9d999 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:11 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Get rid of die() in reparent_op_arg()
To do that, make the function returns the error code. Also pass error_str so that it can set proper error message when error occurred.
--- tools/lib/traceevent/event-parse.h | 5 +- tools/lib/traceevent/parse-filter.c | 94 +++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 35 deletions(-)
tools/lib/traceevent/event-parse.h +4 -1
@@ -364,7 +364,10 @@ enum pevent_flag {_PE (ILLEGAL_LVALUE ,"illegal lvalue for string comparison" ), \_PE (INVALID_REGEX ,"regex did not compute" ), \_PE (ILLEGAL_STRING_CMP ,"illegal comparison for string" ), \ - _PE(ILLEGAL_INTEGER_CMP,"illegal comparison for integer") +_PE (ILLEGAL_INTEGER_CMP ,"illegal comparison for integer" ), \ +_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \ +_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \ + _PE(BAD_FILTER_ARG, "bad arg in filter tree") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +60 -34
211 lines not on this page · raw message
PATCH 9/14 tools lib traceevent: Refactor create_arg_item()
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
So that it can return a proper pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 3 ++- tools/lib/traceevent/parse-filter.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-)
tools/lib/traceevent/event-parse.h +2 -1
@@ -367,7 +367,8 @@ enum pevent_flag {_PE (ILLEGAL_INTEGER_CMP ,"illegal comparison for integer" ), \_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \ - _PE(BAD_FILTER_ARG, "bad arg in filter tree") +_PE (BAD_FILTER_ARG ,"bad arg in filter tree" ), \ + _PE(UNEXPECTED_TYPE, "unexpected type (not a value)")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +10 -10
@@ -368,9 +368,9 @@ static void free_events(struct event_list *events) } } -static struct filter_arg * +static enum pevent_errno create_arg_item (struct event_format *event,const char *token, -enum event_type type,char **error_str) +enum event_type type,struct filter_arg **parg,char **error_str) {struct format_field *field;struct filter_arg *arg;
@@ -378,7 +378,7 @@ create_arg_item(struct event_format *event, const char *token, arg =allocate_arg ();if (arg ==NULL ) {show_error (error_str,"failed to allocate filter arg" ); -return NULL ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; }switch (type) {
@@ -392,7 +392,7 @@ create_arg_item(struct event_format *event, const char *token,if (!arg->value.str) {free_arg (arg);show_error (error_str,"failed to allocate string filter arg" ); -return NULL ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; }break ;case EVENT_ITEM :
@@ -420,11 +420,11 @@ create_arg_item(struct event_format *event, const char *token,break ;default :free_arg (arg); -show_error (error_str,"expected a value but found %s" , - token); -return NULL ; +show_error (error_str,"expected a value but found %s" , token); +return PEVENT_ERRNO__UNEXPECTED_TYPE ; } -return arg; + *parg = arg; +return 0 ; } static struct filter_arg *
@@ -993,8 +993,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,case EVENT_SQUOTE :case EVENT_DQUOTE :case EVENT_ITEM : - arg =create_arg_item (event, token, type, error_str); -if (!arg) + ret =create_arg_item (event, token, type, &arg, error_str); +if (ret <0 ) goto fail;if (!left_item) left_item = arg;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Refactor create_arg_item()
tools lib traceevent: Refactor create_arg_item()
Commit-ID: c8ea690dd0d1385a766d68c51832497181e013b8 Gitweb: http://git.kernel.org/tip/c8ea690dd0d1385a766d68c51832497181e013b8 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:12 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Refactor create_arg_item()
So that it can return a proper pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 3 ++- tools/lib/traceevent/parse-filter.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-)
tools/lib/traceevent/event-parse.h +2 -1
@@ -367,7 +367,8 @@ enum pevent_flag {_PE (ILLEGAL_INTEGER_CMP ,"illegal comparison for integer" ), \_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \ - _PE(BAD_FILTER_ARG, "bad arg in filter tree") +_PE (BAD_FILTER_ARG ,"bad arg in filter tree" ), \ + _PE(UNEXPECTED_TYPE, "unexpected type (not a value)")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +10 -10
@@ -368,9 +368,9 @@ static void free_events(struct event_list *events) } } -static struct filter_arg * +static enum pevent_errno create_arg_item (struct event_format *event,const char *token, -enum event_type type,char **error_str) +enum event_type type,struct filter_arg **parg,char **error_str) {struct format_field *field;struct filter_arg *arg;
@@ -378,7 +378,7 @@ create_arg_item(struct event_format *event, const char *token, arg =allocate_arg ();if (arg ==NULL ) {show_error (error_str,"failed to allocate filter arg" ); -return NULL ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; }switch (type) {
@@ -392,7 +392,7 @@ create_arg_item(struct event_format *event, const char *token,if (!arg->value.str) {free_arg (arg);show_error (error_str,"failed to allocate string filter arg" ); -return NULL ; +return PEVENT_ERRNO__MEM_ALLOC_FAILED ; }break ;case EVENT_ITEM :
@@ -420,11 +420,11 @@ create_arg_item(struct event_format *event, const char *token,break ;default :free_arg (arg); -show_error (error_str,"expected a value but found %s" , - token); -return NULL ; +show_error (error_str,"expected a value but found %s" , token); +return PEVENT_ERRNO__UNEXPECTED_TYPE ; } -return arg; + *parg = arg; +return 0 ; } static struct filter_arg *
@@ -993,8 +993,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,case EVENT_SQUOTE :case EVENT_DQUOTE :case EVENT_ITEM : - arg =create_arg_item (event, token, type, error_str); -if (!arg) + ret =create_arg_item (event, token, type, &arg, error_str); +if (ret <0 ) goto fail;if (!left_item) left_item = arg;
PATCH 10/14 tools lib traceevent: Refactor process_filter()
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
So that it can return a proper pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 6 +++- tools/lib/traceevent/parse-filter.c | 64 +++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 28 deletions(-)
tools/lib/traceevent/event-parse.h +5 -1
@@ -368,7 +368,11 @@ enum pevent_flag {_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \_PE (BAD_FILTER_ARG ,"bad arg in filter tree" ), \ - _PE(UNEXPECTED_TYPE, "unexpected type (not a value)") +_PE (UNEXPECTED_TYPE ,"unexpected type (not a value)" ), \ +_PE (ILLEGAL_TOKEN ,"illegal token" ), \ +_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \ +_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \ + _PE(UNKNOWN_TOKEN, "unknown token") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +37 -27
202 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Refactor process_filter()
tools lib traceevent: Refactor process_filter()
Commit-ID: 42d6194d133cbaf12f34cbdc4111bd8f7dc0ed2a Gitweb: http://git.kernel.org/tip/42d6194d133cbaf12f34cbdc4111bd8f7dc0ed2a Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:13 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Refactor process_filter()
So that it can return a proper pevent_errno value.
--- tools/lib/traceevent/event-parse.h | 6 +++- tools/lib/traceevent/parse-filter.c | 64 +++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 28 deletions(-)
tools/lib/traceevent/event-parse.h +5 -1
@@ -368,7 +368,11 @@ enum pevent_flag {_PE (REPARENT_NOT_OP ,"cannot reparent other than OP" ), \_PE (REPARENT_FAILED ,"failed to reparent filter OP" ), \_PE (BAD_FILTER_ARG ,"bad arg in filter tree" ), \ - _PE(UNEXPECTED_TYPE, "unexpected type (not a value)") +_PE (UNEXPECTED_TYPE ,"unexpected type (not a value)" ), \ +_PE (ILLEGAL_TOKEN ,"illegal token" ), \ +_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \ +_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \ + _PE(UNKNOWN_TOKEN, "unknown token") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __code
tools/lib/traceevent/parse-filter.c +37 -27
202 lines not on this page · raw message
PATCH 11/14 tools lib traceevent: Make pevent_filter_add_filter_str() return pevent_errno
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Refactor the pevent_filter_add_filter_str() to return a proper error code and get rid of the third error_str argument.
--- tools/lib/traceevent/event-parse.h | 8 ++-- tools/lib/traceevent/parse-filter.c | 78 +++++++++++-------------------------- 2 files changed, 27 insertions(+), 59 deletions(-)
tools/lib/traceevent/event-parse.h +4 -4
@@ -372,7 +372,8 @@ enum pevent_flag {_PE (ILLEGAL_TOKEN ,"illegal token" ), \_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \ - _PE(UNKNOWN_TOKEN, "unknown token") +_PE (UNKNOWN_TOKEN ,"unknown token" ), \ + _PE(FILTER_NOT_FOUND, "no filter found")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
@@ -863,9 +864,8 @@ enum filter_trivial_type { FILTER_TRIVIAL_BOTH, }; -int pevent_filter_add_filter_str (struct event_filter *filter, -const char *filter_str, -char **error_str); +enum pevent_errno pevent_filter_add_filter_str (struct event_filter *filter, +const char *filter_str); int pevent_filter_match(struct event_filter *filter,
tools/lib/traceevent/parse-filter.c +23 -55
172 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Make pevent_filter_add_filter_str() return pevent_errno
tools lib traceevent: Make pevent_filter_add_filter_str() return pevent_errno
Commit-ID: 69c770a690422c6cdc4ea52d9edbba7c20cd1aff Gitweb: http://git.kernel.org/tip/69c770a690422c6cdc4ea52d9edbba7c20cd1aff Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:14 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Make pevent_filter_add_filter_str() return pevent_errno
Refactor the pevent_filter_add_filter_str() to return a proper error code and get rid of the third error_str argument.
--- tools/lib/traceevent/event-parse.h | 8 ++-- tools/lib/traceevent/parse-filter.c | 78 +++++++++++-------------------------- 2 files changed, 27 insertions(+), 59 deletions(-)
tools/lib/traceevent/event-parse.h +4 -4
@@ -372,7 +372,8 @@ enum pevent_flag {_PE (ILLEGAL_TOKEN ,"illegal token" ), \_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \ - _PE(UNKNOWN_TOKEN, "unknown token") +_PE (UNKNOWN_TOKEN ,"unknown token" ), \ + _PE(FILTER_NOT_FOUND, "no filter found")#undef _PE#define _PE (__code, __str) PEVENT_ERRNO__ ## __code
@@ -863,9 +864,8 @@ enum filter_trivial_type { FILTER_TRIVIAL_BOTH, }; -int pevent_filter_add_filter_str (struct event_filter *filter, -const char *filter_str, -char **error_str); +enum pevent_errno pevent_filter_add_filter_str (struct event_filter *filter, +const char *filter_str); int pevent_filter_match(struct event_filter *filter,
tools/lib/traceevent/parse-filter.c +23 -55
172 lines not on this page · raw message
PATCH 12/14 tools lib traceevent: Refactor pevent_filter_match() to get rid of die()
In reply to Namhyung KimThe test_filter() function is for testing given filter is matched to a given record. However it doesn't handle error cases properly so add a new argument err to save error info during the test and also pass it to internal test functions.
The return value of pevent_filter_match() also converted to pevent_errno to indicate an exact error case.
--- tools/lib/traceevent/event-parse.h | 21 ++++-- tools/lib/traceevent/parse-filter.c | 135 +++++++++++++++++++++++------------- 2 files changed, 99 insertions(+), 57 deletions(-)
tools/lib/traceevent/event-parse.h +14 -7
@@ -357,6 +357,8 @@ enum pevent_flag {_PE (READ_PRINT_FAILED ,"failed to read event print fmt" ), \_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \ +_PE (INVALID_EXP_TYPE ,"invalid expression type" ), \ +_PE (INVALID_OP_TYPE ,"invalid operator type" ), \_PE (INVALID_EVENT_NAME ,"invalid event name" ), \_PE (EVENT_NOT_FOUND ,"no event found" ), \ _PE(SYNTAX_ERROR, "syntax error"), \
@@ -373,12 +375,16 @@ enum pevent_flag {_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \_PE (UNKNOWN_TOKEN ,"unknown token" ), \ - _PE(FILTER_NOT_FOUND, "no filter found") +_PE (FILTER_NOT_FOUND ,"no filter found" ), \ +_PE (NOT_A_NUMBER ,"must have number field" ), \ +_PE (NO_FILTER ,"no filters exists" ), \ + _PE(FILTER_MISS, "record does not match to filter") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __codeenum pevent_errno {PEVENT_ERRNO__SUCCESS =0 , +PEVENT_ERRNO__FILTER_MATCH =PEVENT_ERRNO__SUCCESS ,/* * Choose an arbitrary negative big number not to clash with standard
@@ -853,10 +859,11 @@ struct event_filter {struct event_filter *pevent_filter_alloc (struct pevent *pevent); -#define FILTER_NONE -2 -#define FILTER_NOEXIST -1 -#define FILTER_MISS 0 -#define FILTER_MATCH 1 +/* for backward compatibility */ +#define FILTER_NONE PEVENT_ERRNO__FILTER_NOT_FOUND +#define FILTER_NOEXIST PEVENT_ERRNO__NO_FILTER +#define FILTER_MISS PEVENT_ERRNO__FILTER_MISS +#define FILTER_MATCH PEVENT_ERRNO__FILTER_MATCHenum filter_trivial_type {FILTER_TRIVIAL_FALSE ,
@@ -868,8 +875,8 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter, const char *filter_str); -int pevent_filter_match (struct event_filter *filter, -struct pevent_record *record); +enum pevent_errno pevent_filter_match (struct event_filter *filter, +struct pevent_record *record);int pevent_event_filtered (struct event_filter *filter,int event_id);
tools/lib/traceevent/parse-filter.c +85 -50
260 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Refactor pevent_filter_match() to get rid of die()
tools lib traceevent: Refactor pevent_filter_match() to get rid of die()
Commit-ID: 41e12e580a7b0c151199f927193548b84d3e874c Gitweb: http://git.kernel.org/tip/41e12e580a7b0c151199f927193548b84d3e874c Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:15 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 13 Dec 2013 10:30:22 -0300
tools lib traceevent: Refactor pevent_filter_match() to get rid of die()
The test_filter() function is for testing given filter is matched to a given record. However it doesn't handle error cases properly so add a new argument err to save error info during the test and also pass it to internal test functions.
The return value of pevent_filter_match() also converted to pevent_errno to indicate an exact error case.
--- tools/lib/traceevent/event-parse.h | 21 ++++-- tools/lib/traceevent/parse-filter.c | 135 +++++++++++++++++++++++------------- 2 files changed, 99 insertions(+), 57 deletions(-)
tools/lib/traceevent/event-parse.h +14 -7
@@ -357,6 +357,8 @@ enum pevent_flag {_PE (READ_PRINT_FAILED ,"failed to read event print fmt" ), \_PE (OLD_FTRACE_ARG_FAILED ,"failed to allocate field name for ftrace" ),\_PE (INVALID_ARG_TYPE ,"invalid argument type" ), \ +_PE (INVALID_EXP_TYPE ,"invalid expression type" ), \ +_PE (INVALID_OP_TYPE ,"invalid operator type" ), \_PE (INVALID_EVENT_NAME ,"invalid event name" ), \_PE (EVENT_NOT_FOUND ,"no event found" ), \ _PE(SYNTAX_ERROR, "syntax error"), \
@@ -373,12 +375,16 @@ enum pevent_flag {_PE (INVALID_PAREN ,"open parenthesis cannot come here" ), \_PE (UNBALANCED_PAREN ,"unbalanced number of parenthesis" ), \_PE (UNKNOWN_TOKEN ,"unknown token" ), \ - _PE(FILTER_NOT_FOUND, "no filter found") +_PE (FILTER_NOT_FOUND ,"no filter found" ), \ +_PE (NOT_A_NUMBER ,"must have number field" ), \ +_PE (NO_FILTER ,"no filters exists" ), \ + _PE(FILTER_MISS, "record does not match to filter") #undef _PE #define _PE(__code, __str) PEVENT_ERRNO__ ## __codeenum pevent_errno {PEVENT_ERRNO__SUCCESS =0 , +PEVENT_ERRNO__FILTER_MATCH =PEVENT_ERRNO__SUCCESS ,/* * Choose an arbitrary negative big number not to clash with standard
@@ -853,10 +859,11 @@ struct event_filter {struct event_filter *pevent_filter_alloc (struct pevent *pevent); -#define FILTER_NONE -2 -#define FILTER_NOEXIST -1 -#define FILTER_MISS 0 -#define FILTER_MATCH 1 +/* for backward compatibility */ +#define FILTER_NONE PEVENT_ERRNO__FILTER_NOT_FOUND +#define FILTER_NOEXIST PEVENT_ERRNO__NO_FILTER +#define FILTER_MISS PEVENT_ERRNO__FILTER_MISS +#define FILTER_MATCH PEVENT_ERRNO__FILTER_MATCHenum filter_trivial_type {FILTER_TRIVIAL_FALSE ,
@@ -868,8 +875,8 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter, const char *filter_str); -int pevent_filter_match (struct event_filter *filter, -struct pevent_record *record); +enum pevent_errno pevent_filter_match (struct event_filter *filter, +struct pevent_record *record);int pevent_event_filtered (struct event_filter *filter,int event_id);
tools/lib/traceevent/parse-filter.c +85 -50
260 lines not on this page · raw message
PATCH 13/14 tools lib traceevent: Get rid of die() in some string conversion funcitons
In reply to Namhyung KimThose functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling die().
--- tools/lib/traceevent/parse-filter.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-)
tools/lib/traceevent/parse-filter.c +36 -22
@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }
@@ -2097,7 +2099,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else
@@ -2120,7 +2124,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) } len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); + str =malloc (len); +if (str ==NULL ) +break ;snprintf (str, len,"(%s) %s (%s)" , left, op, right);break ;
@@ -2138,7 +2144,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) right_val =0 ;if (right_val >=0 ) {/* just return the opposite */ - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (right_val)strcpy (str,"FALSE" );else
@@ -2146,8 +2154,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } len =strlen (right) +strlen (op) +3 ; - str =malloc_or_die (len); -snprintf (str, len,"%s(%s)" , op, right); + str =malloc (len); +if (str) +snprintf (str, len,"%s(%s)" , op, right);break ;default :
@@ -2163,9 +2172,9 @@ static char *val_to_str(struct event_filter *filter, struct filter_arg *arg) {char *str; - str =malloc_or_die (30 ); - -snprintf (str,30 ,"%lld" , arg->value.val); + str =malloc (30 ); +if (str) +snprintf (str,30 ,"%lld" , arg->value.val);return str; }
@@ -2220,12 +2229,14 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) op ="^" ;break ;default : -die ("oops in exp" ); + op ="[ERROR IN EXPRESSION TYPE]" ; +break ; } len =strlen (op) +strlen (lstr) +strlen (rstr) +4 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s %s" , lstr, op, rstr); + str =malloc (len); +if (str) +snprintf (str, len,"%s %s %s" , lstr, op, rstr); out:free (lstr);free (rstr);
@@ -2271,9 +2282,9 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) op ="<=" ; len =strlen (lstr) +strlen (op) +strlen (rstr) +4 ; - str =malloc_or_die (len); -sprintf (str,"%s %s %s" , lstr, op, rstr); - + str =malloc (len); +if (str) +sprintf (str,"%s %s %s" , lstr, op, rstr);break ;default :
@@ -2311,10 +2322,11 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) len =strlen (arg->str.field->name) +strlen (op) +strlen (arg->str.val) +6 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s \"%s\"" , - arg->str.field->name, - op, arg->str.val); + str =malloc (len); +if (str) { +snprintf (str, len,"%s %s \"%s\"" , + arg->str.field->name, op, arg->str.val); + }break ;default :
@@ -2330,7 +2342,9 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)switch (arg->type) {case FILTER_ARG_BOOLEAN : - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +return NULL ;if (arg->boolean.value)strcpy (str,"TRUE" );else
@@ -2369,7 +2383,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* * Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)
Signature · 1 line
1.7.11.7
Arnaldo Carvalho de Melo
AppliedRe: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Em Thu, Dec 12, 2013 at 04:36:16PM +0900, Namhyung Kim escreveu:
Quoted 38 lines
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/traceevent/parse-filter.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-)tools/lib/traceevent/parse-filter.c +7
-3@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }@@ -2097,7 +2099,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else
tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2131
Quoted 9 lines
tools/lib/traceevent/parse-filter.c +3
-1@@ -2120,7 +2124,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) } len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); + str =malloc (len); +if (str ==NULL ) +break ;snprintf (str, len,"(%s) %s (%s)" , left, op, right);
Why note:
str = NULL; if (asprintf(&str, "(%s) %s (%s)", left, op, right); break;
instead?
Ditto for other places here, also there is a typo in the subject line.
I've applied all the previous patches, thanks!
- Arnaldo
Quoted 106 lines
tools/lib/traceevent/parse-filter.c +26
-18break ;@@ -2138,7 +2144,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) right_val =0 ;if (right_val >=0 ) {/* just return the opposite */ - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (right_val)strcpy (str,"FALSE" );else @@ -2146,8 +2154,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } len =strlen (right) +strlen (op) +3 ; - str =malloc_or_die (len); -snprintf (str, len,"%s(%s)" , op, right); + str =malloc (len); +if (str) +snprintf (str, len,"%s(%s)" , op, right);break ;default :@@ -2163,9 +2172,9 @@ static char *val_to_str(struct event_filter *filter, struct filter_arg *arg) {char *str; - str =malloc_or_die (30 ); - -snprintf (str,30 ,"%lld" , arg->value.val); + str =malloc (30 ); +if (str) +snprintf (str,30 ,"%lld" , arg->value.val);return str; }@@ -2220,12 +2229,14 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) op ="^" ;break ;default : -die ("oops in exp" ); + op ="[ERROR IN EXPRESSION TYPE]" ; +break ; } len =strlen (op) +strlen (lstr) +strlen (rstr) +4 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s %s" , lstr, op, rstr); + str =malloc (len); +if (str) +snprintf (str, len,"%s %s %s" , lstr, op, rstr); out:free (lstr);free (rstr);@@ -2271,9 +2282,9 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) op ="<=" ; len =strlen (lstr) +strlen (op) +strlen (rstr) +4 ; - str =malloc_or_die (len); -sprintf (str,"%s %s %s" , lstr, op, rstr); - + str =malloc (len); +if (str) +sprintf (str,"%s %s %s" , lstr, op, rstr);break ;default :@@ -2311,10 +2322,11 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) len =strlen (arg->str.field->name) +strlen (op) +strlen (arg->str.val) +6 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s \"%s\"" , - arg->str.field->name, - op, arg->str.val); + str =malloc (len); +if (str) { +snprintf (str, len,"%s %s \"%s\"" , + arg->str.field->name, op, arg->str.val); + }break ;default :@@ -2330,7 +2342,9 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)switch (arg->type) {case FILTER_ARG_BOOLEAN : - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +return NULL ;if (arg->boolean.value)strcpy (str,"TRUE" );else @@ -2369,7 +2383,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* * Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)Signature · 1 line
1.7.11.7
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Hi Arnaldo,
Quoted 55 lines · Arnaldo Carvalho de Melo
Em Thu, Dec 12, 2013 at 04:36:16PM +0900, Namhyung Kim escreveu:
Quoted 38 lines
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/traceevent/parse-filter.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-)tools/lib/traceevent/parse-filter.c +7
-3@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }@@ -2097,7 +2099,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2131
Quoted 9 lines
tools/lib/traceevent/parse-filter.c +3
-1@@ -2120,7 +2124,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) } len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); + str =malloc (len); +if (str ==NULL ) +break ;snprintf (str, len,"(%s) %s (%s)" , left, op, right);Why note:
str = NULL; if (asprintf(&str, "(%s) %s (%s)", left, op, right); break;
Quoted 5 lines
instead?
Ditto for other places here, also there is a typo in the subject line.
I've applied all the previous patches, thanks!
Thank you very much!
Here is the updated patch:
Quoted 1 line
From
d775295fb53930b1e3d946e145e9a6172773d4f5Mon Sep 17 00:00:00 2001
From: Namhyung Kim <[email protected]>
Date: Sat, 7 Dec 2013 15:13:35 +0000
Subject: [PATCH v2.1 13/14] tools lib traceevent: Get rid of die() in some string
conversion functions
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling die().
--- tools/lib/traceevent/parse-filter.c | 59 +++++++++++++++---------------------- 1 file changed, 24 insertions(+), 35 deletions(-)
tools/lib/traceevent/parse-filter.c +24 -35
@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }
@@ -2050,7 +2052,6 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)int left_val =-1 ;int right_val =-1 ;int val; -int len;switch (arg->op.type) {case FILTER_OP_AND :
@@ -2097,7 +2098,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else
@@ -2119,10 +2122,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } - len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); -snprintf (str, len,"(%s) %s (%s)" , - left, op, right); +asprintf (&str,"(%s) %s (%s)" , left, op, right);break ;case FILTER_OP_NOT :
@@ -2138,16 +2138,16 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) right_val =0 ;if (right_val >=0 ) {/* just return the opposite */ - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (right_val)strcpy (str,"FALSE" );else strcpy (str,"TRUE" );break ; } - len =strlen (right) +strlen (op) +3 ; - str =malloc_or_die (len); -snprintf (str, len,"%s(%s)" , op, right); +asprintf (&str,"%s(%s)" , op, right);break ;default :
@@ -2161,11 +2161,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)static char *val_to_str (struct event_filter *filter,struct filter_arg *arg) { -char *str; - - str =malloc_or_die (30 ); +char *str =NULL ; -snprintf (str,30 ,"%lld" , arg->value.val); +asprintf (&str,"%lld" , arg->value.val);return str; }
@@ -2181,7 +2179,6 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *op;char *str =NULL ; -int len; lstr =arg_to_str (filter, arg->exp.left); rstr =arg_to_str (filter, arg->exp.right);
@@ -2220,12 +2217,11 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) op ="^" ;break ;default : -die ("oops in exp" ); + op ="[ERROR IN EXPRESSION TYPE]" ; +break ; } - len =strlen (op) +strlen (lstr) +strlen (rstr) +4 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s %s" , lstr, op, rstr); +asprintf (&str,"%s %s %s" , lstr, op, rstr); out:free (lstr);free (rstr);
@@ -2239,7 +2235,6 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *str =NULL ;char *op =NULL ; -int len; lstr =arg_to_str (filter, arg->num.left); rstr =arg_to_str (filter, arg->num.right);
@@ -2270,10 +2265,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="<=" ; - len =strlen (lstr) +strlen (op) +strlen (rstr) +4 ; - str =malloc_or_die (len); -sprintf (str,"%s %s %s" , lstr, op, rstr); - +asprintf (&str,"%s %s %s" , lstr, op, rstr);break ;default :
@@ -2291,7 +2283,6 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) {char *str =NULL ;char *op =NULL ; -int len;switch (arg->str.type) {case FILTER_CMP_MATCH :
@@ -2309,12 +2300,8 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="!~" ; - len =strlen (arg->str.field->name) +strlen (op) + -strlen (arg->str.val) +6 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s \"%s\"" , - arg->str.field->name, - op, arg->str.val); +asprintf (&str,"%s %s \"%s\"" , + arg->str.field->name, op, arg->str.val);break ;default :
@@ -2330,7 +2317,9 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)switch (arg->type) {case FILTER_ARG_BOOLEAN : - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +return NULL ;if (arg->boolean.value)strcpy (str,"TRUE" );else
@@ -2369,7 +2358,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* * Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)
Signature · 1 line
1.7.11.7
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Em Fri, Dec 13, 2013 at 09:15:46AM +0900, Namhyung Kim escreveu:
Quoted 60 lines
Hi Arnaldo,
Quoted 57 lines · Arnaldo Carvalho de Melo
Em Thu, Dec 12, 2013 at 04:36:16PM +0900, Namhyung Kim escreveu:
Quoted 38 lines
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/traceevent/parse-filter.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-)tools/lib/traceevent/parse-filter.c +7
-3@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }@@ -2097,7 +2099,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2131
Quoted 9 lines
tools/lib/traceevent/parse-filter.c +3
-1@@ -2120,7 +2124,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) } len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); + str =malloc (len); +if (str ==NULL ) +break ;snprintf (str, len,"(%s) %s (%s)" , left, op, right);Why note:
str = NULL; if (asprintf(&str, "(%s) %s (%s)", left, op, right); break;instead?
Quoted 7 lines
Quoted 3 lines
Ditto for other places here, also there is a typo in the subject line.
I've applied all the previous patches, thanks!
Thank you very much!
Here is the updated patch:
Thanks! There are some more questions below:
Quoted 42 lines
From
d775295fb53930b1e3d946e145e9a6172773d4f5Mon Sep 17 00:00:00 2001
From: Namhyung Kim <[email protected]>
Date: Sat, 7 Dec 2013 15:13:35 +0000
Subject: [PATCH v2.1 13/14] tools lib traceevent: Get rid ofdie()in some string
conversion functionsThose functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/traceevent/parse-filter.c | 59 +++++++++++++++---------------------- 1 file changed, 24 insertions(+), 35 deletions(-)tools/lib/traceevent/parse-filter.c +4
-3@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }@@ -2050,7 +2052,6 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)int left_val =-1 ;int right_val =-1 ;int val; -int len;switch (arg->op.type) {case FILTER_OP_AND :
tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2106
Quoted 10 lines
tools/lib/traceevent/parse-filter.c +3
-1@@ -2097,7 +2098,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else
The malloc here can be combined with the strcpy, and the else clause gets immediately after:
if (asprintf(&str, "%s", "TRUE") < 0)
tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2126
Quoted 10 lines
tools/lib/traceevent/parse-filter.c +1
-4@@ -2119,10 +2122,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } - len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); -snprintf (str, len,"(%s) %s (%s)" , - left, op, right); +asprintf (&str,"(%s) %s (%s)" , left, op, right);break ;
I was unsure if str was NULL, it is already, at decl site, good :)
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
- Arnaldo
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Hi Arnaldo,
Quoted 26 lines · Arnaldo Carvalho de Melo
tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2106
Quoted 7 lines
tools/lib/traceevent/parse-filter.c +3
-1- str =malloc_or_die (6 ); + str =malloc (6 ); +if (str ==NULL ) +break ;if (val)strcpy (str,"TRUE" );else The malloc here can be combined with the strcpy, and the else clause gets immediately after:
if (asprintf(&str, "%s", "TRUE") < 0)tools/lib/traceevent/parse-filter.c static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2126
Quoted 10 lines
tools/lib/traceevent/parse-filter.c +1
-4@@ -2119,10 +2122,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } - len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); -snprintf (str, len,"(%s) %s (%s)" , - left, op, right); +asprintf (&str,"(%s) %s (%s)" , left, op, right);break ;I was unsure if str was NULL, it is already, at decl site, good :)
Quoted 2 lines
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
Hmm.. did you mean like this?
str = NULL;
if (val)
asprintf(&str, "TRUE");
else
asprintf(&str, "FALSE");
return str;Thanks,
Namhyung
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Em Mon, Dec 16, 2013 at 01:49:11PM +0900, Namhyung Kim escreveu:
Quoted 12 lines · Arnaldo Carvalho de Melo
Quoted 2 lines
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
Hmm.. did you mean like this?
str = NULL; if (val) asprintf(&str, "TRUE"); else asprintf(&str, "FALSE"); return str;
More compact:
if (asprintf(&str, "%s", val ? "TRUE" : "FALSE") < 0) // error handling path
At that point str already is set to NULL.
- Arnaldo
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Hi Arnaldo,
Quoted 14 lines · Arnaldo Carvalho de Melo
Em Mon, Dec 16, 2013 at 01:49:11PM +0900, Namhyung Kim escreveu:
Quoted 12 lines · Arnaldo Carvalho de Melo
Quoted 2 lines
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
Hmm.. did you mean like this?
str = NULL; if (val) asprintf(&str, "TRUE"); else asprintf(&str, "FALSE"); return str;
Quoted 6 lines
More compact:
if (asprintf(&str, "%s", val ? "TRUE" : "FALSE") < 0) // error handling pathAt that point str already is set to NULL.
Okay, this is a new one:
Quoted 1 line
From
56f95f2341161ff2a9155d36605a74623a4ce663Mon Sep 17 00:00:00 2001
From: Namhyung Kim <[email protected]>
Date: Sat, 7 Dec 2013 15:13:35 +0000
Subject: [PATCH v2.2 13/14] tools lib traceevent: Get rid of die() in some string
conversion functions
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling die().
--- tools/lib/traceevent/parse-filter.c | 67 +++++++++++-------------------------- 1 file changed, 19 insertions(+), 48 deletions(-)
tools/lib/traceevent/parse-filter.c +19 -48
@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }
@@ -2050,7 +2052,6 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)int left_val =-1 ;int right_val =-1 ;int val; -int len;switch (arg->op.type) {case FILTER_OP_AND :
@@ -2097,11 +2098,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); -if (val) -strcpy (str,"TRUE" ); -else -strcpy (str,"FALSE" ); +asprintf (&str, val ?"TRUE" :"FALSE" );break ; } }
@@ -2119,10 +2116,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } - len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); -snprintf (str, len,"(%s) %s (%s)" , - left, op, right); +asprintf (&str,"(%s) %s (%s)" , left, op, right);break ;case FILTER_OP_NOT :
@@ -2138,16 +2132,10 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) right_val =0 ;if (right_val >=0 ) {/* just return the opposite */ - str =malloc_or_die (6 ); -if (right_val) -strcpy (str,"FALSE" ); -else -strcpy (str,"TRUE" ); +asprintf (&str, right_val ?"FALSE" :"TRUE" );break ; } - len =strlen (right) +strlen (op) +3 ; - str =malloc_or_die (len); -snprintf (str, len,"%s(%s)" , op, right); +asprintf (&str,"%s(%s)" , op, right);break ;default :
@@ -2161,11 +2149,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)static char *val_to_str (struct event_filter *filter,struct filter_arg *arg) { -char *str; - - str =malloc_or_die (30 ); +char *str =NULL ; -snprintf (str,30 ,"%lld" , arg->value.val); +asprintf (&str,"%lld" , arg->value.val);return str; }
@@ -2181,7 +2167,6 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *op;char *str =NULL ; -int len; lstr =arg_to_str (filter, arg->exp.left); rstr =arg_to_str (filter, arg->exp.right);
@@ -2220,12 +2205,11 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) op ="^" ;break ;default : -die ("oops in exp" ); + op ="[ERROR IN EXPRESSION TYPE]" ; +break ; } - len =strlen (op) +strlen (lstr) +strlen (rstr) +4 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s %s" , lstr, op, rstr); +asprintf (&str,"%s %s %s" , lstr, op, rstr); out:free (lstr);free (rstr);
@@ -2239,7 +2223,6 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *str =NULL ;char *op =NULL ; -int len; lstr =arg_to_str (filter, arg->num.left); rstr =arg_to_str (filter, arg->num.right);
@@ -2270,10 +2253,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="<=" ; - len =strlen (lstr) +strlen (op) +strlen (rstr) +4 ; - str =malloc_or_die (len); -sprintf (str,"%s %s %s" , lstr, op, rstr); - +asprintf (&str,"%s %s %s" , lstr, op, rstr);break ;default :
@@ -2291,7 +2271,6 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) {char *str =NULL ;char *op =NULL ; -int len;switch (arg->str.type) {case FILTER_CMP_MATCH :
@@ -2309,12 +2288,8 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="!~" ; - len =strlen (arg->str.field->name) +strlen (op) + -strlen (arg->str.val) +6 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s \"%s\"" , - arg->str.field->name, - op, arg->str.val); +asprintf (&str,"%s %s \"%s\"" , + arg->str.field->name, op, arg->str.val);break ;default :
@@ -2326,15 +2301,11 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)static char *arg_to_str (struct event_filter *filter,struct filter_arg *arg) { -char *str; +char *str =NULL ;switch (arg->type) {case FILTER_ARG_BOOLEAN : - str =malloc_or_die (6 ); -if (arg->boolean.value) -strcpy (str,"TRUE" ); -else -strcpy (str,"FALSE" ); +asprintf (&str, arg->boolean.value ?"TRUE" :"FALSE" );return str;case FILTER_ARG_OP :
@@ -2369,7 +2340,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* * Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)
Signature · 1 line
1.7.11.7
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Em Tue, Dec 17, 2013 at 09:02:36AM +0900, Namhyung Kim escreveu:
Quoted 15 lines · Arnaldo Carvalho de Melo
Quoted 13 lines
Em Mon, Dec 16, 2013 at 01:49:11PM +0900, Namhyung Kim escreveu:
Quoted 12 lines · Arnaldo Carvalho de Melo
Quoted 2 lines
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
Hmm.. did you mean like this?
str = NULL; if (val) asprintf(&str, "TRUE"); else asprintf(&str, "FALSE"); return str;
Quoted 8 lines
Quoted 6 lines
More compact:
if (asprintf(&str, "%s", val ? "TRUE" : "FALSE") < 0) // error handling pathAt that point str already is set to NULL.
Okay, this is a new one:
Thanks, it all seems now, but just prior to applying this I noticed:
Quoted 3 lines
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().
It handles NULL in what way? This comment:
tools/lib/traceevent/parse-filter.c static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2345
Quoted 8 lines
tools/lib/traceevent/parse-filter.c +1
-1@@ -2369,7 +2340,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)
Made me a bit unconfortable, so if it handles NULL as a filter not found, how will it figure out what happened?
/me looks at the callers...
Quoted 1 line
From just a quick look I couldn't see cases where NULL could cause
segfaults, but saw some cases where allocation errors would not be notified in any way to the user :-\
Anyway, applying this patch, those are other kinds of problems, i.e. further fallout from converting from the previous panic()-at-alloc-failure approach.
- Arnaldo
Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons
Hi Arnaldo,
Quoted 45 lines · Arnaldo Carvalho de Melo
Em Tue, Dec 17, 2013 at 09:02:36AM +0900, Namhyung Kim escreveu:
Quoted 15 lines · Arnaldo Carvalho de Melo
Quoted 13 lines
Em Mon, Dec 16, 2013 at 01:49:11PM +0900, Namhyung Kim escreveu:
Quoted 12 lines · Arnaldo Carvalho de Melo
Quoted 2 lines
All the rest is ok, so its just the malloc + strcpy that remains to be converted, do you want me to do it?
Hmm.. did you mean like this?
str = NULL; if (val) asprintf(&str, "TRUE"); else asprintf(&str, "FALSE"); return str;Quoted 8 lines
Quoted 6 lines
More compact:
if (asprintf(&str, "%s", val ? "TRUE" : "FALSE") < 0) // error handling pathAt that point str already is set to NULL.
Okay, this is a new one:
Thanks, it all seems now, but just prior to applying this I noticed:
Quoted 3 lines
Those functions are for stringify filter arguments. As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling
die().It handles NULL in what way? This comment:
tools/lib/traceevent/parse-filter.c static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg) · line 2345
Quoted 8 lines
tools/lib/traceevent/parse-filter.c +1
-1@@ -2369,7 +2340,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)Made me a bit unconfortable, so if it handles NULL as a filter not found, how will it figure out what happened?
Quoted 5 lines
/me looks at the callers...
From just a quick look I couldn't see cases where NULL could cause segfaults, but saw some cases where allocation errors would not be notified in any way to the user :-\
Right. I just wanted to keep the existing interface as long as possible.
Quoted 3 lines
Anyway, applying this patch, those are other kinds of problems, i.e. further fallout from converting from the previous panic()-at-alloc-failure approach.
Thanks! But there's one more patch (14/14) left from the series. Please also consider merging it too. :)
Thanks,
Namhyung
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Get rid of die() in some string conversion functions
In reply to Namhyung Kimtools lib traceevent: Get rid of die() in some string conversion functions
Commit-ID: f23b24f1bf90b56cfaeb2a1c9b77c46efe8916a6 Gitweb: http://git.kernel.org/tip/f23b24f1bf90b56cfaeb2a1c9b77c46efe8916a6 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 17 Dec 2013 09:02:36 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 17 Dec 2013 16:51:49 -0300
tools lib traceevent: Get rid of die() in some string conversion functions
Those functions stringify filter arguments.
As caller of those functions handles NULL string properly, it seems that it's enough to return NULL rather than calling die().
--- tools/lib/traceevent/parse-filter.c | 67 +++++++++++-------------------------- 1 file changed, 19 insertions(+), 48 deletions(-)
tools/lib/traceevent/parse-filter.c +19 -48
@@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,if (ret >=0 && pevent->test_filters) {char *test; test =pevent_filter_make_string (filter, event->event->id); -printf (" '%s: %s'\n" , event->event->name, test); -free (test); +if (test) { +printf (" '%s: %s'\n" , event->event->name, test); +free (test); + } } }
@@ -2050,7 +2052,6 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)int left_val =-1 ;int right_val =-1 ;int val; -int len;switch (arg->op.type) {case FILTER_OP_AND :
@@ -2097,11 +2098,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)default :break ; } - str =malloc_or_die (6 ); -if (val) -strcpy (str,"TRUE" ); -else -strcpy (str,"FALSE" ); +asprintf (&str, val ?"TRUE" :"FALSE" );break ; } }
@@ -2119,10 +2116,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)break ; } - len =strlen (left) +strlen (right) +strlen (op) +10 ; - str =malloc_or_die (len); -snprintf (str, len,"(%s) %s (%s)" , - left, op, right); +asprintf (&str,"(%s) %s (%s)" , left, op, right);break ;case FILTER_OP_NOT :
@@ -2138,16 +2132,10 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) right_val =0 ;if (right_val >=0 ) {/* just return the opposite */ - str =malloc_or_die (6 ); -if (right_val) -strcpy (str,"FALSE" ); -else -strcpy (str,"TRUE" ); +asprintf (&str, right_val ?"FALSE" :"TRUE" );break ; } - len =strlen (right) +strlen (op) +3 ; - str =malloc_or_die (len); -snprintf (str, len,"%s(%s)" , op, right); +asprintf (&str,"%s(%s)" , op, right);break ;default :
@@ -2161,11 +2149,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)static char *val_to_str (struct event_filter *filter,struct filter_arg *arg) { -char *str; - - str =malloc_or_die (30 ); +char *str =NULL ; -snprintf (str,30 ,"%lld" , arg->value.val); +asprintf (&str,"%lld" , arg->value.val);return str; }
@@ -2181,7 +2167,6 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *op;char *str =NULL ; -int len; lstr =arg_to_str (filter, arg->exp.left); rstr =arg_to_str (filter, arg->exp.right);
@@ -2220,12 +2205,11 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) op ="^" ;break ;default : -die ("oops in exp" ); + op ="[ERROR IN EXPRESSION TYPE]" ; +break ; } - len =strlen (op) +strlen (lstr) +strlen (rstr) +4 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s %s" , lstr, op, rstr); +asprintf (&str,"%s %s %s" , lstr, op, rstr); out:free (lstr);free (rstr);
@@ -2239,7 +2223,6 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)char *rstr;char *str =NULL ;char *op =NULL ; -int len; lstr =arg_to_str (filter, arg->num.left); rstr =arg_to_str (filter, arg->num.right);
@@ -2270,10 +2253,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="<=" ; - len =strlen (lstr) +strlen (op) +strlen (rstr) +4 ; - str =malloc_or_die (len); -sprintf (str,"%s %s %s" , lstr, op, rstr); - +asprintf (&str,"%s %s %s" , lstr, op, rstr);break ;default :
@@ -2291,7 +2271,6 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) {char *str =NULL ;char *op =NULL ; -int len;switch (arg->str.type) {case FILTER_CMP_MATCH :
@@ -2309,12 +2288,8 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)if (!op) op ="!~" ; - len =strlen (arg->str.field->name) +strlen (op) + -strlen (arg->str.val) +6 ; - str =malloc_or_die (len); -snprintf (str, len,"%s %s \"%s\"" , - arg->str.field->name, - op, arg->str.val); +asprintf (&str,"%s %s \"%s\"" , + arg->str.field->name, op, arg->str.val);break ;default :
@@ -2326,15 +2301,11 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)static char *arg_to_str (struct event_filter *filter,struct filter_arg *arg) { -char *str; +char *str =NULL ;switch (arg->type) {case FILTER_ARG_BOOLEAN : - str =malloc_or_die (6 ); -if (arg->boolean.value) -strcpy (str,"TRUE" ); -else -strcpy (str,"FALSE" ); +asprintf (&str, arg->boolean.value ?"TRUE" :"FALSE" );return str;case FILTER_ARG_OP :
@@ -2369,7 +2340,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg)* * Returns a string that displays the filter contents. * This string must be freed with free(str). -* NULL is returned if no filter is found. +* NULL is returned if no filter is found or allocation failed. */ char *pevent_filter_make_string (struct event_filter *filter,int event_id)
PATCH 14/14 tools lib traceevent: Introduce pevent_filter_strerror()
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The pevent_filter_strerror() function is for receiving actual error message from pevent_errno value. To do that, add a static buffer to event_filter for saving internal error message
If a failed function saved other information in the static buffer returns the information, otherwise returns generic error message.
--- tools/lib/traceevent/event-parse.c | 17 +------ tools/lib/traceevent/event-parse.h | 7 ++- tools/lib/traceevent/parse-filter.c | 98 ++++++++++++++++++++----------------- 3 files changed, 61 insertions(+), 61 deletions(-)
tools/lib/traceevent/event-parse.c +1 -16
@@ -5230,22 +5230,7 @@ int pevent_strerror(struct pevent *pevent __maybe_unused, idx = errnum - __PEVENT_ERRNO__START -1 ; msg = pevent_error_str[idx]; - -switch (errnum) { -case PEVENT_ERRNO__MEM_ALLOC_FAILED : -case PEVENT_ERRNO__PARSE_EVENT_FAILED : -case PEVENT_ERRNO__READ_ID_FAILED : -case PEVENT_ERRNO__READ_FORMAT_FAILED : -case PEVENT_ERRNO__READ_PRINT_FAILED : -case PEVENT_ERRNO__OLD_FTRACE_ARG_FAILED : -case PEVENT_ERRNO__INVALID_ARG_TYPE : -snprintf (buf, buflen,"%s" , msg); -break ; - -default : -/* cannot reach here */ -break ; - } +snprintf (buf, buflen,"%s" , msg);return 0 ; }
tools/lib/traceevent/event-parse.h +6 -1
@@ -851,10 +851,13 @@ struct filter_type {struct filter_arg *filter; }; +#define PEVENT_FILTER_ERROR_BUFSZ 1024 +struct event_filter {struct pevent *pevent;int filters;struct filter_type *event_filters; +char error_buffer[PEVENT_FILTER_ERROR_BUFSZ ]; };struct event_filter *pevent_filter_alloc (struct pevent *pevent);
@@ -874,10 +877,12 @@ enum filter_trivial_type {enum pevent_errno pevent_filter_add_filter_str (struct event_filter *filter,const char *filter_str); -enum pevent_errno pevent_filter_match (struct event_filter *filter,struct pevent_record *record); +int pevent_filter_strerror (struct event_filter *filter,enum pevent_errno err, +char *buf,size_t buflen); +int pevent_event_filtered (struct event_filter *filter,int event_id);
tools/lib/traceevent/parse-filter.c +54 -44
207 lines not on this page · raw message
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] tools lib traceevent: Introduce pevent_filter_strerror()
tools lib traceevent: Introduce pevent_filter_strerror()
Commit-ID: bf19b82e7cf033319525a9eab12216b59c41c519 Gitweb: http://git.kernel.org/tip/bf19b82e7cf033319525a9eab12216b59c41c519 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 12 Dec 2013 16:36:17 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 18 Dec 2013 14:47:58 -0300
tools lib traceevent: Introduce pevent_filter_strerror()
The pevent_filter_strerror() function is for receiving actual error message from pevent_errno value. To do that, add a static buffer to event_filter for saving internal error message
If a failed function saved other information in the static buffer returns the information, otherwise returns generic error message.
--- tools/lib/traceevent/event-parse.c | 17 +------ tools/lib/traceevent/event-parse.h | 7 ++- tools/lib/traceevent/parse-filter.c | 98 ++++++++++++++++++++----------------- 3 files changed, 61 insertions(+), 61 deletions(-)
tools/lib/traceevent/event-parse.c +1 -16
@@ -5230,22 +5230,7 @@ int pevent_strerror(struct pevent *pevent __maybe_unused, idx = errnum - __PEVENT_ERRNO__START -1 ; msg = pevent_error_str[idx]; - -switch (errnum) { -case PEVENT_ERRNO__MEM_ALLOC_FAILED : -case PEVENT_ERRNO__PARSE_EVENT_FAILED : -case PEVENT_ERRNO__READ_ID_FAILED : -case PEVENT_ERRNO__READ_FORMAT_FAILED : -case PEVENT_ERRNO__READ_PRINT_FAILED : -case PEVENT_ERRNO__OLD_FTRACE_ARG_FAILED : -case PEVENT_ERRNO__INVALID_ARG_TYPE : -snprintf (buf, buflen,"%s" , msg); -break ; - -default : -/* cannot reach here */ -break ; - } +snprintf (buf, buflen,"%s" , msg);return 0 ; }
tools/lib/traceevent/event-parse.h +6 -1
@@ -851,10 +851,13 @@ struct filter_type {struct filter_arg *filter; }; +#define PEVENT_FILTER_ERROR_BUFSZ 1024 +struct event_filter {struct pevent *pevent;int filters;struct filter_type *event_filters; +char error_buffer[PEVENT_FILTER_ERROR_BUFSZ ]; };struct event_filter *pevent_filter_alloc (struct pevent *pevent);
@@ -874,10 +877,12 @@ enum filter_trivial_type {enum pevent_errno pevent_filter_add_filter_str (struct event_filter *filter,const char *filter_str); -enum pevent_errno pevent_filter_match (struct event_filter *filter,struct pevent_record *record); +int pevent_filter_strerror (struct event_filter *filter,enum pevent_errno err, +char *buf,size_t buflen); +int pevent_event_filtered (struct event_filter *filter,int event_id);
tools/lib/traceevent/parse-filter.c +54 -44
207 lines not on this page · raw message