iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools lib traceevent: Get rid of malloc_or_die() in find_event()

Browse Source 
Make it return pevent_errno to distinguish malloc allocation failure.
Since it'll be returned to user later, add more error code.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386833777-3790-6-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:08 +09:00 committed by Arnaldo Carvalho de Melo
parent 91dfa49bdd
commit 605b8fda95
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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);