Add command to show event formats from the data file

Sometimes we need to see the event formats that are stored in a data
file. This patch adds the options "--events" that prints out these
formats.

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

3 files changed, 66 insertions, 18 deletions

diff --git a/trace-cmd.h b/trace-cmd.h
index afd7d6b..39dff16 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -42,6 +42,8 @@ int tracecmd_long_size(struct tracecmd_input *handle);
 int tracecmd_page_size(struct tracecmd_input *handle);
 int tracecmd_cpus(struct tracecmd_input *handle);
 
+void tracecmd_print_events(struct tracecmd_input *handle);
+
 int tracecmd_init_data(struct tracecmd_input *handle);
 
 struct record *
diff --git a/trace-input.c b/trace-input.c
index 23d4986..46c5e05 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -38,10 +38,15 @@ struct tracecmd_input {
         int             fd;
         int             long_size;
         int             page_size;
-        int             print_events;
         int             read_page;
         int             cpus;
         struct cpu_data *cpu_data;
+
+        /* file information */
+        size_t          header_files_start;
+        size_t          ftrace_files_start;
+        size_t          event_files_start;
+        
 };
 
 __thread struct tracecmd_input *tracecmd_curr_thread_handle;
@@ -220,6 +225,9 @@ static int read_header_files(struct tracecmd_input *handle)
 
         free(header);
 
+        handle->ftrace_files_start =
+                lseek64(handle->fd, 0, SEEK_CUR);
+
         return 0;
 
  failed_read:
@@ -228,7 +236,7 @@ static int read_header_files(struct tracecmd_input *handle)
 }
 
 static int read_ftrace_file(struct tracecmd_input *handle,
-                            unsigned long long size)
+                            unsigned long long size, int print)
 {
         struct pevent *pevent = handle->pevent;
         char *buf;
@@ -241,37 +249,41 @@ static int read_ftrace_file(struct tracecmd_input *handle,
                 return -1;
         }
 
-        pevent_parse_event(pevent, buf, size, "ftrace");
+        if (print)
+                printf("%.*s\n", (int)size, buf);
+        else
+                pevent_parse_event(pevent, buf, size, "ftrace");
         free(buf);
 
         return 0;
 }
 
 static int read_event_file(struct tracecmd_input *handle,
-                           char *system, unsigned long long size)
+                           char *system, unsigned long long size,
+                           int print)
 {
         struct pevent *pevent = handle->pevent;
         char *buf;
 
-        buf = malloc(size+1);
+        buf = malloc(size);
         if (!buf)
                 return -1;
 
-        if (do_read_check(handle,buf, size)) {
+        if (do_read_check(handle, buf, size)) {
                 free(buf);
                 return -1;
         }
 
-        buf[size] = 0;
-        if (handle->print_events)
-                printf("%s\n", buf);
-        pevent_parse_event(pevent, buf, size, system);
+        if (print)
+                printf("%.*s\n", (int)size, buf);
+        else
+                pevent_parse_event(pevent, buf, size, system);
         free(buf);
 
         return 0;
 }
 
-static int read_ftrace_files(struct tracecmd_input *handle)
+static int read_ftrace_files(struct tracecmd_input *handle, int print)
 {
         unsigned long long size;
         int count;
@@ -286,15 +298,18 @@ static int read_ftrace_files(struct tracecmd_input *handle)
                 size = read8(handle);
                 if (size < 0)
                         return -1;
-                ret = read_ftrace_file(handle, size);
+                ret = read_ftrace_file(handle, size, print);
                 if (ret < 0)
                         return -1;
         }
 
+        handle->event_files_start =
+                lseek64(handle->fd, 0, SEEK_CUR);
+
         return 0;
 }
 
-static int read_event_files(struct tracecmd_input *handle)
+static int read_event_files(struct tracecmd_input *handle, int print)
 {
         unsigned long long size;
         char *system;
@@ -312,6 +327,9 @@ static int read_event_files(struct tracecmd_input *handle)
                 if (!system)
                         return -1;
 
+                if (print)
+                        printf("\nsystem: %s\n", system);
+
                 count = read4(handle);
                 if (count < 0)
                         goto failed;
@@ -321,7 +339,7 @@ static int read_event_files(struct tracecmd_input *handle)
                         if (size < 0)
                                 goto failed;
 
-                        ret = read_event_file(handle, system, size);
+                        ret = read_event_file(handle, system, size, print);
                         if (ret < 0)
                                 goto failed;
                 }
@@ -398,11 +416,11 @@ int tracecmd_read_headers(struct tracecmd_input *handle)
         if (ret < 0)
                 return -1;
 
-        ret = read_ftrace_files(handle);
+        ret = read_ftrace_files(handle, 0);
         if (ret < 0)
                 return -1;
 
-        ret = read_event_files(handle);
+        ret = read_event_files(handle, 0);
         if (ret < 0)
                 return -1;
 
@@ -1032,6 +1050,22 @@ int tracecmd_init_data(struct tracecmd_input *handle)
         return 0;
 }
 
+void tracecmd_print_events(struct tracecmd_input *handle)
+{
+        int ret;
+
+        if (!handle->ftrace_files_start) {
+                lseek64(handle->fd, handle->header_files_start, SEEK_SET);
+                read_header_files(handle);
+        }
+        ret = read_ftrace_files(handle, 1);
+        if (ret < 0)
+                return;
+
+        read_event_files(handle, 1);
+        return;
+}
+
 struct tracecmd_input *tracecmd_open(int fd)
 {
         struct tracecmd_input *handle;
@@ -1078,6 +1112,9 @@ struct tracecmd_input *tracecmd_open(int fd)
 
         handle->page_size = read4(handle);
 
+        handle->header_files_start =
+                lseek64(handle->fd, 0, SEEK_CUR);
+
         return handle;
 
  failed_read:
diff --git a/trace-read.c b/trace-read.c
index 9bc7f60..3baa9d8 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -42,8 +42,6 @@ unsigned int page_size;
 int input_fd;
 const char *input_file = "trace.dat";
 
-int show_events = 0;
-
 static int filter_cpu = -1;
 
 static void show_data(struct tracecmd_input *handle, int cpu)
@@ -141,6 +139,8 @@ void trace_report (int argc, char **argv)
         int show_page_size = 0;
         int show_printk = 0;
         int latency_format;
+        int show_events = 0;
+        int print_events = 0;
         int c;
 
         if (argc < 2)
@@ -153,6 +153,7 @@ void trace_report (int argc, char **argv)
                 int option_index = 0;
                 static struct option long_options[] = {
                         {"cpu", required_argument, NULL, 0},
+                        {"events", no_argument, NULL, 0},
                         {"help", no_argument, NULL, '?'},
                         {NULL, 0, NULL, 0}
                 };
@@ -191,6 +192,9 @@ void trace_report (int argc, char **argv)
                         case 0:
                                 filter_cpu = atoi(optarg);
                                 break;
+                        case 1:
+                                print_events = 1;
+                                break;
                         default:
                                 usage(argv);
                         }
@@ -222,6 +226,11 @@ void trace_report (int argc, char **argv)
                 return;
         }
 
+        if (print_events) {
+                tracecmd_print_events(handle);
+                return;
+        }
+
         if (tracecmd_read_headers(handle) < 0)
                 return;