Merge parse_ftrace_file() into prase_event_file()

With the new ftrace format, the parse_ftrace_file function is almost
identical to the parse_event_file. Merge the two.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 39 insertions, 62 deletions

diff --git a/parse-events.c b/parse-events.c
index aac5561..40b25d4 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3404,10 +3404,8 @@ int parse_header_page(char *buf, unsigned long size)
         return 0;
 }
 
-int parse_ftrace_file(char *buf, unsigned long size)
+int parse_event_file(char *buf, unsigned long size, char *sys)
 {
-        struct format_field *field;
-        struct print_arg *arg, **list;
         struct event *event;
         int ret;
 
@@ -3417,73 +3415,27 @@ int parse_ftrace_file(char *buf, unsigned long size)
         if (!event)
                 return -ENOMEM;
 
-        event->flags |= EVENT_FL_ISFTRACE;
-
         event->name = event_read_name();
         if (!event->name)
-                die("failed to read ftrace event name");
-
-        if (strcmp(event->name, "function") == 0)
-                event->flags |= EVENT_FL_ISFUNC;
-
-        else if (strcmp(event->name, "funcgraph_entry") == 0)
-                event->flags |= EVENT_FL_ISFUNCENT;
+                die("failed to read event name");
 
-        else if (strcmp(event->name, "funcgraph_exit") == 0)
-                event->flags |= EVENT_FL_ISFUNCRET;
+        if (strcmp(sys, "ftrace") == 0) {
 
-        else if (strcmp(event->name, "bprint") == 0)
-                event->flags |= EVENT_FL_ISBPRINT;
+                event->flags |= EVENT_FL_ISFTRACE;
 
-        event->id = event_read_id();
-        if (event->id < 0)
-                die("failed to read ftrace event id");
+                if (strcmp(event->name, "function") == 0)
+                        event->flags |= EVENT_FL_ISFUNC;
 
-        add_event(event);
+                else if (strcmp(event->name, "funcgraph_entry") == 0)
+                        event->flags |= EVENT_FL_ISFUNCENT;
 
-        ret = event_read_format(event);
-        if (ret < 0)
-                die("failed to read ftrace event format");
+                else if (strcmp(event->name, "funcgraph_exit") == 0)
+                        event->flags |= EVENT_FL_ISFUNCRET;
 
-        ret = event_read_print(event);
-        if (ret < 0)
-                die("failed to read ftrace event print fmt");
-
-        /* New ftrace handles args */
-        if (ret > 0)
-                return 0;
-        /*
-         * The arguments for ftrace files are parsed by the fields.
-         * Set up the fields as their arguments.
-         */
-        list = &event->print_fmt.args;
-        for (field = event->format.fields; field; field = field->next) {
-                arg = malloc_or_die(sizeof(*arg));
-                memset(arg, 0, sizeof(*arg));
-                *list = arg;
-                list = &arg->next;
-                arg->type = PRINT_FIELD;
-                arg->field.name = field->name;
-                arg->field.field = field;
+                else if (strcmp(event->name, "bprint") == 0)
+                        event->flags |= EVENT_FL_ISBPRINT;
         }
-        return 0;
-}
-
-int parse_event_file(char *buf, unsigned long size, char *sys)
-{
-        struct event *event;
-        int ret;
-
-        init_input_buf(buf, size);
-
-        event = alloc_event();
-        if (!event)
-                return -ENOMEM;
-
-        event->name = event_read_name();
-        if (!event->name)
-                die("failed to read event name");
-
+                
         event->id = event_read_id();
         if (event->id < 0)
                 die("failed to read event id");
@@ -3502,11 +3454,31 @@ int parse_event_file(char *buf, unsigned long size, char *sys)
 
         event->system = strdup(sys);
 
+        add_event(event);
+
+        if (!ret && (event->flags & EVENT_FL_ISFTRACE)) {
+                struct format_field *field;
+                struct print_arg *arg, **list;
+
+                /* old ftrace had no args */
+
+                list = &event->print_fmt.args;
+                for (field = event->format.fields; field; field = field->next) {
+                        arg = malloc_or_die(sizeof(*arg));
+                        memset(arg, 0, sizeof(*arg));
+                        *list = arg;
+                        list = &arg->next;
+                        arg->type = PRINT_FIELD;
+                        arg->field.name = field->name;
+                        arg->field.field = field;
+                }
+                return 0;
+        }
+
 #define PRINT_ARGS 0
         if (PRINT_ARGS && event->print_fmt.args)
                 print_args(event->print_fmt.args);
 
-        add_event(event);
         return 0;
 
  event_failed:
@@ -3516,6 +3488,11 @@ int parse_event_file(char *buf, unsigned long size, char *sys)
         return -1;
 }
 
+int parse_ftrace_file(char *buf, unsigned long size)
+{
+        return parse_event_file(buf, size, "ftrace");
+}
+
 void parse_set_info(int nr_cpus, int long_sz)
 {
         cpus = nr_cpus;