trace-cmd: Change tracecmd_open() to take file name

Rename tracecmd_open() to tracecmd_open_fd and add a new
tracecmd_open() to take the name of a file.

Also added the API for tracecmd_close() but still need to do
proper clean up. It just frees the handle, but does nothing with
everything else it allocated.

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

3 files changed, 30 insertions, 6 deletions

diff --git a/trace-cmd.h b/trace-cmd.h
index 371d616..c5a3163 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -44,7 +44,9 @@ char *tracecmd_find_tracing_dir(void);
 
 /* --- Opening and Reading the trace.dat file --- */
 
-struct tracecmd_input *tracecmd_open(int fd);
+struct tracecmd_input *tracecmd_open(const char *file);
+struct tracecmd_input *tracecmd_open_fd(int fd);
+void tracecmd_close(struct tracecmd_input *handle);
 int tracecmd_read_headers(struct tracecmd_input *handle);
 int tracecmd_long_size(struct tracecmd_input *handle);
 int tracecmd_page_size(struct tracecmd_input *handle);
diff --git a/trace-input.c b/trace-input.c
index 80de3cf..ee9177f 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -1316,10 +1316,10 @@ void tracecmd_print_events(struct tracecmd_input *handle)
 }
 
 /**
- * tracecmd_open - create a tracecmd_handle from the trace.dat file descriptor
+ * tracecmd_open_fd - create a tracecmd_handle from the trace.dat file descriptor
  * @fd: the file descriptor for the trace.dat file
  */
-struct tracecmd_input *tracecmd_open(int fd)
+struct tracecmd_input *tracecmd_open_fd(int fd)
 {
         struct tracecmd_input *handle;
         char test[] = { 23, 8, 68 };
@@ -1377,6 +1377,28 @@ struct tracecmd_input *tracecmd_open(int fd)
 }
 
 /**
+ * tracecmd_open - create a tracecmd_handle from a given file
+ * @file: the file name of the file that is of tracecmd data type.
+ */
+struct tracecmd_input *tracecmd_open(const char *file)
+{
+        int fd;
+
+        fd = open(file, O_RDONLY);
+        if (fd < 0)
+                return NULL;
+
+        return tracecmd_open_fd(fd);
+}
+
+void tracecmd_close(struct tracecmd_input *handle)
+{
+        /* TODO FREE EVERYTHING!!! %%%% MEMORY LEAK!!! %%%% */
+        close(handle->fd);
+        free(handle);
+}
+
+/**
  * tracecmd_long_size - return the size of "long" for the arch
  * @handle: input handle for the trace.dat file
  */
diff --git a/trace-read.c b/trace-read.c
index b6b233c..e875189 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -38,8 +38,8 @@
 
 #include "trace-local.h"
 
-unsigned int page_size;
-int input_fd;
+static unsigned int page_size;
+static int input_fd;
 const char *input_file = "trace.dat";
 
 static int filter_cpu = -1;
@@ -276,7 +276,7 @@ struct tracecmd_input *read_trace_header(void)
         if (input_fd < 0)
                 die("opening '%s'\n", input_file);
 
-        return tracecmd_open(input_fd);
+        return tracecmd_open_fd(input_fd);
 }
 
 void trace_report (int argc, char **argv)