UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools lib traceevent: Refactor create_arg_item() 

So that it can return a proper pevent_errno value.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386833777-3790-10-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2013-12-12 16:36:12 +09:00 committed by Arnaldo Carvalho de Melo
parent 7bb73553e2
commit c8ea690dd0
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lib/traceevent/event-parse.h
View File

@ -367,7 +367,8 @@ enum pevent_flag {
_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_NOT_OP, "cannot reparent other than OP"), \
_PE(REPARENT_FAILED, "failed to reparent filter 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 #undef _PE
#define _PE(__code, __str) PEVENT_ERRNO__ ## __code #define _PE(__code, __str) PEVENT_ERRNO__ ## __code

20
tools/lib/traceevent/parse-filter.c
View File

@ -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, 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 format_field *field;
struct filter_arg *arg; struct filter_arg *arg;
@ -378,7 +378,7 @@ create_arg_item(struct event_format *event, const char *token,
arg = allocate_arg(); arg = allocate_arg();
if (arg == NULL) { if (arg == NULL) {
show_error(error_str, "failed to allocate filter arg"); show_error(error_str, "failed to allocate filter arg");
return NULL; return PEVENT_ERRNO__MEM_ALLOC_FAILED;
} }
switch (type) { switch (type) {
@ -392,7 +392,7 @@ create_arg_item(struct event_format *event, const char *token,
if (!arg->value.str) { if (!arg->value.str) {
free_arg(arg); free_arg(arg);
show_error(error_str, "failed to allocate string filter arg"); show_error(error_str, "failed to allocate string filter arg");
return NULL; return PEVENT_ERRNO__MEM_ALLOC_FAILED;
} }
break; break;
case EVENT_ITEM: case EVENT_ITEM:
@ -420,11 +420,11 @@ create_arg_item(struct event_format *event, const char *token,
break; break;
default: default:
free_arg(arg); free_arg(arg);
show_error(error_str, "expected a value but found %s", show_error(error_str, "expected a value but found %s", token);
token); return PEVENT_ERRNO__UNEXPECTED_TYPE;
return NULL;
} }
return arg; *parg = arg;
return 0;
} }
static struct filter_arg * static struct filter_arg *
@ -993,8 +993,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,
case EVENT_SQUOTE: case EVENT_SQUOTE:
case EVENT_DQUOTE: case EVENT_DQUOTE:
case EVENT_ITEM: case EVENT_ITEM:
arg = create_arg_item(event, token, type, error_str); ret = create_arg_item(event, token, type, &arg, error_str);
if (!arg) if (ret < 0)
goto fail; goto fail;
if (!left_item) if (!left_item)
left_item = arg; left_item = arg;