tools lib traceevent: Get rid of die() from pevent_register_event_handler
If memory allocation for handler fails, return gracefully instead of calling die(). Note that casts to void * are needed because gcc complained about discarding 'const' qualifier during implicit argument cast. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1346986187-5170-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
245c5a1843
Коммит
0ca8da00ad
|
@ -5183,7 +5183,12 @@ int pevent_register_event_handler(struct pevent *pevent,
|
|||
|
||||
not_found:
|
||||
/* Save for later use. */
|
||||
handle = malloc_or_die(sizeof(*handle));
|
||||
handle = malloc(sizeof(*handle));
|
||||
if (!handle) {
|
||||
do_warning("Failed to allocate event handler");
|
||||
return PEVENT_ERRNO__MEM_ALLOC_FAILED;
|
||||
}
|
||||
|
||||
memset(handle, 0, sizeof(*handle));
|
||||
handle->id = id;
|
||||
if (event_name)
|
||||
|
@ -5193,7 +5198,11 @@ int pevent_register_event_handler(struct pevent *pevent,
|
|||
|
||||
if ((event_name && !handle->event_name) ||
|
||||
(sys_name && !handle->sys_name)) {
|
||||
die("Failed to allocate event/sys name");
|
||||
do_warning("Failed to allocate event/sys name");
|
||||
free((void *)handle->event_name);
|
||||
free((void *)handle->sys_name);
|
||||
free(handle);
|
||||
return PEVENT_ERRNO__MEM_ALLOC_FAILED;
|
||||
}
|
||||
|
||||
handle->func = func;
|
||||
|
|
Загрузка…
Ссылка в новой задаче