Merge branch 'trace-cmd' into trace-view

Updated to handle the API change to tracecmd_open().

       modified:   kernel-shark.c
       modified:   trace-cmd.h
       modified:   trace-graph-main.c
       modified:   trace-graph.c
       modified:   trace-input.c
       modified:   trace-read.c
       modified:   trace-view-main.c

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

7 files changed, 110 insertions, 46 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 8820109..6742da9 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -548,12 +548,6 @@ void kernel_shark(int argc, char **argv)
                 die("error reading header");
         info->handle = handle;
 
-        if (tracecmd_read_headers(handle) < 0)
-                return;
-
-        if (tracecmd_init_data(handle) < 0)
-                die("failed to init data");
-
         gtk_init(&argc, &argv);
 
         /* --- Main window --- */
diff --git a/trace-cmd.h b/trace-cmd.h
index 2c46ac8..3639fdd 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -39,8 +39,11 @@ char *tracecmd_find_tracing_dir(void);
 
 /* --- Opening and Reading the trace.dat file --- */
 
+struct tracecmd_input *tracecmd_alloc(const char *file);
+struct tracecmd_input *tracecmd_alloc_fd(int fd);
 struct tracecmd_input *tracecmd_open(const char *file);
 struct tracecmd_input *tracecmd_open_fd(int fd);
+void tracecmd_ref(struct tracecmd_input *handle);
 void tracecmd_close(struct tracecmd_input *handle);
 int tracecmd_read_headers(struct tracecmd_input *handle);
 int tracecmd_long_size(struct tracecmd_input *handle);
diff --git a/trace-graph-main.c b/trace-graph-main.c
index fdf73fa..93b7c3c 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -26,34 +26,6 @@ void usage(char *prog)
         printf("  -i    input_file, default is %s\n", default_input_file);
 }
 
-static struct tracecmd_input *read_tracecmd(gchar *filename)
-{
-        struct tracecmd_input *handle;
-
-        handle = tracecmd_open(filename);
-
-        if (!handle) {
-                warning("can not load %s", filename);
-                return NULL;
-        }
-
-        if (tracecmd_read_headers(handle) < 0) {
-                warning("can not read %s headers", filename);
-                goto failed;
-        }
-
-        if (tracecmd_init_data(handle) < 0) {
-                warning("can not init %s", filename);
-                goto failed;
-        }
-
-        return handle;
-
- failed:
-        tracecmd_close(handle);
-        return NULL;
-}
-
 /* Callback for the clicked signal of the Load button */
 static void
 load_clicked (gpointer data)
@@ -71,9 +43,12 @@ load_clicked (gpointer data)
                                              NULL);
         if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                 filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-                handle = read_tracecmd(filename);
-                if (handle)
+                handle = tracecmd_open(filename);
+                if (handle) {
                         trace_graph_load_handle(ginfo, handle);
+                        /* Free handle when freeing graph */
+                        tracecmd_close(handle);
+                }
                 g_free(filename);
         }
         gtk_widget_destroy(dialog);
@@ -155,13 +130,17 @@ void trace_graph(int argc, char **argv)
         }
 
         if (input_file)
-                handle = read_tracecmd(input_file);
+                handle = tracecmd_open(input_file);
 
         gtk_init(&argc, &argv);
 
         /* graph struct is used by handlers */
         ginfo = trace_graph_create(handle);
 
+        /* Free handle when freeing graph */
+        if (handle)
+                tracecmd_close(handle);
+
         /* --- Main window --- */
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/trace-graph.c b/trace-graph.c
index d31f7a5..6e67bd7 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -2033,6 +2033,7 @@ static int load_handle(struct graph_info *ginfo,
                 trace_graph_free_info(ginfo);
 
         ginfo->handle = handle;
+        tracecmd_ref(handle);
 
         ginfo->pevent = tracecmd_get_pevent(handle);
         ginfo->cpus = tracecmd_cpus(handle);
diff --git a/trace-input.c b/trace-input.c
index 1462b4b..dc1167a 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -52,6 +52,7 @@ struct tracecmd_input {
         int                     page_size;
         int                     read_page;
         int                     cpus;
+        int                     ref;
         struct cpu_data         *cpu_data;
 
         /* file information */
@@ -1470,10 +1471,20 @@ void tracecmd_print_events(struct tracecmd_input *handle)
 }
 
 /**
- * tracecmd_open_fd - create a tracecmd_handle from the trace.dat file descriptor
+ * tracecmd_alloc_fd - create a tracecmd_input handle from a file descriptor
  * @fd: the file descriptor for the trace.dat file
+ *
+ * Allocate a tracecmd_input handle from a file descriptor and open the
+ * file. This tests if the file is of trace-cmd format and allocates
+ * a parse event descriptor.
+ *
+ * The returned pointer is not ready to be read yet. A tracecmd_read_headers()
+ * and tracecmd_init_data() still need to be called on the descriptor.
+ *
+ * Unless you know what you are doing with this, you want to use
+ * tracecmd_open_fd() instead.
  */
-struct tracecmd_input *tracecmd_open_fd(int fd)
+struct tracecmd_input *tracecmd_alloc_fd(int fd)
 {
         struct tracecmd_input *handle;
         char test[] = { 23, 8, 68 };
@@ -1486,6 +1497,7 @@ struct tracecmd_input *tracecmd_open_fd(int fd)
         memset(handle, 0, sizeof(*handle));
 
         handle->fd = fd;
+        handle->ref = 1;
 
         if (do_read_check(handle, buf, 3))
                 goto failed_read;
@@ -1531,6 +1543,56 @@ struct tracecmd_input *tracecmd_open_fd(int fd)
 }
 
 /**
+ * tracecmd_alloc_fd - create a tracecmd_input handle from a file name
+ * @file: the file name of the file that is of tracecmd data type.
+ *
+ * Allocate a tracecmd_input handle from a given file name and open the
+ * file. This tests if the file is of trace-cmd format and allocates
+ * a parse event descriptor.
+ *
+ * The returned pointer is not ready to be read yet. A tracecmd_read_headers()
+ * and tracecmd_init_data() still need to be called on the descriptor.
+ *
+ * Unless you know what you are doing with this, you want to use
+ * tracecmd_open() instead.
+ */
+struct tracecmd_input *tracecmd_alloc(const char *file)
+{
+        int fd;
+
+        fd = open(file, O_RDONLY);
+        if (fd < 0)
+                return NULL;
+
+        return tracecmd_alloc_fd(fd);
+}
+
+/**
+ * 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_fd(int fd)
+{
+        struct tracecmd_input *handle;
+
+        handle = tracecmd_alloc_fd(fd);
+        if (!handle)
+                return NULL;
+
+        if (tracecmd_read_headers(handle) < 0)
+                goto fail;
+
+        if (tracecmd_init_data(handle) < 0)
+                goto fail;
+
+        return handle;
+
+fail:
+        tracecmd_close(handle);
+        return NULL;
+}
+
+/**
  * tracecmd_open - create a tracecmd_handle from a given file
  * @file: the file name of the file that is of tracecmd data type.
  */
@@ -1545,6 +1607,29 @@ struct tracecmd_input *tracecmd_open(const char *file)
         return tracecmd_open_fd(fd);
 }
 
+/**
+ * tracecmd_ref - add a reference to the handle
+ * @handle: input handle for the trace.dat file
+ *
+ * Some applications may share a handle between parts of
+ * the application. Let those parts add reference counters
+ * to the handle, and the last one to close it will free it.
+ */
+void tracecmd_ref(struct tracecmd_input *handle)
+{
+        if (!handle)
+                return;
+
+        handle->ref++;
+}
+
+/**
+ * tracecmd_close - close and free the trace.dat handle
+ * @handle: input handle for the trace.dat file
+ *
+ * Close the file descriptor of the handle and frees
+ * the resources allocated by the handle.
+ */
 void tracecmd_close(struct tracecmd_input *handle)
 {
         int cpu;
@@ -1552,6 +1637,14 @@ void tracecmd_close(struct tracecmd_input *handle)
         if (!handle)
                 return;
 
+        if (handle->ref <= 0) {
+                warning("tracecmd: bad ref count on handle\n");
+                return;
+        }
+
+        if (--handle->ref)
+                return;
+
         for (cpu = 0; cpu < handle->cpus; cpu++) {
                 struct record *rec;
                 /*
diff --git a/trace-read.c b/trace-read.c
index f2c7de2..306fa3a 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -276,7 +276,7 @@ struct tracecmd_input *read_trace_header(void)
         if (input_fd < 0)
                 die("opening '%s'\n", input_file);
 
-        return tracecmd_open_fd(input_fd);
+        return tracecmd_alloc_fd(input_fd);
 }
 
 void trace_report (int argc, char **argv)
diff --git a/trace-view-main.c b/trace-view-main.c
index c728646..d98ddb7 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -136,12 +136,6 @@ void trace_view(int argc, char **argv)
         if (!handle)
                 die("error reading header");
 
-        if (tracecmd_read_headers(handle) < 0)
-                return;
-
-        if (tracecmd_init_data(handle) < 0)
-                die("failed to init data");
-
         gtk_init(&argc, &argv);
 
         /* --- Main window --- */