tools lib traceevent: Get rid of die() from pevent_register_print_function

If memory allocation for handler fails or argument type is not match,
return gracefully instead of calling die().  Also add an new error code
for the later case.

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-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 17fd01d46e60260c60c3dcc53ff9f03c9c42a9f7..4595aeb3c4321504a09324d81c97e3418468061f 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -5080,6 +5080,7 @@ int pevent_register_print_function(struct pevent *pevent,
        struct pevent_func_params *param;
        enum pevent_func_arg_type type;
        va_list ap;
+       int ret;
 
        func_handle = find_func_handler(pevent, name);
        if (func_handle) {
@@ -5092,14 +5093,21 @@ int pevent_register_print_function(struct pevent *pevent,
                remove_func_handler(pevent, name);
        }
 
-       func_handle = malloc_or_die(sizeof(*func_handle));
+       func_handle = malloc(sizeof(*func_handle));
+       if (!func_handle) {
+               do_warning("Failed to allocate function handler");
+               return PEVENT_ERRNO__MEM_ALLOC_FAILED;
+       }
        memset(func_handle, 0, sizeof(*func_handle));
 
        func_handle->ret_type = ret_type;
        func_handle->name = strdup(name);
        func_handle->func = func;
-       if (!func_handle->name)
-               die("Failed to allocate function name");
+       if (!func_handle->name) {
+               do_warning("Failed to allocate function name");
+               free(func_handle);
+               return PEVENT_ERRNO__MEM_ALLOC_FAILED;
+       }
 
        next_param = &(func_handle->params);
        va_start(ap, name);
@@ -5109,11 +5117,17 @@ int pevent_register_print_function(struct pevent *pevent,
                        break;
 
                if (type < 0 || type >= PEVENT_FUNC_ARG_MAX_TYPES) {
-                       warning("Invalid argument type %d", type);
+                       do_warning("Invalid argument type %d", type);
+                       ret = PEVENT_ERRNO__INVALID_ARG_TYPE;
                        goto out_free;
                }
 
-               param = malloc_or_die(sizeof(*param));
+               param = malloc(sizeof(*param));
+               if (!param) {
+                       do_warning("Failed to allocate function param");
+                       ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
+                       goto out_free;
+               }
                param->type = type;
                param->next = NULL;
 
@@ -5131,7 +5145,7 @@ int pevent_register_print_function(struct pevent *pevent,
  out_free:
        va_end(ap);
        free_func_handle(func_handle);
-       return -1;
+       return ret;
 }
 
 /**

diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 863a0bbda7f1ba3add137fdac1a17f5a469a90a0..3318963f1c9873acccdd471553f9a133d24ec172 100644 (file)
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -351,7 +351,8 @@ enum pevent_flag {
        _PE(READ_ID_FAILED,     "failed to read event id"),                   \
        _PE(READ_FORMAT_FAILED, "failed to read event format"),               \
        _PE(READ_PRINT_FAILED,  "failed to read event print fmt"),            \
-       _PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace")
+       _PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace"),\
+       _PE(INVALID_ARG_TYPE,   "invalid argument type")
 
 #undef _PE
 #define _PE(__code, __str) PEVENT_ERRNO__ ## __code