trace-graph: Added loading of files

Modified trace-graph to open withoun any files loaded.

Added an "Load File" menu option to open a file dialog to load
a new file. Also allow to load new files.

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

3 files changed, 204 insertions, 61 deletions

diff --git a/trace-graph-main.c b/trace-graph-main.c
index 80907d2..fdf73fa 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -2,6 +2,9 @@
 #include <gtk/gtk.h>
 #include <getopt.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "trace-cmd.h"
 #include "trace-graph.h"
@@ -13,7 +16,7 @@
 #define TRACE_HEIGHT    600
 
 #define default_input_file "trace.dat"
-static char *input_file = default_input_file;
+static char *input_file;
 static struct graph_info *ginfo;
 
 void usage(char *prog)
@@ -23,6 +26,59 @@ 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)
+{
+        struct graph_info *ginfo = data;
+        struct tracecmd_input *handle;
+        GtkWidget *dialog;
+        gchar *filename;
+
+        dialog = gtk_file_chooser_dialog_new("Load File",
+                                             NULL,
+                                             GTK_FILE_CHOOSER_ACTION_OPEN,
+                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                             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)
+                        trace_graph_load_handle(ginfo, handle);
+                g_free(filename);
+        }
+        gtk_widget_destroy(dialog);
+}
+
 /* Callback for the clicked signal of the Exit button */
 static void
 exit_clicked (GtkWidget *widget, gpointer data)
@@ -51,6 +107,9 @@ events_clicked (gpointer data)
         gchar **systems = NULL;
         gint *events = NULL;
 
+        if (!ginfo->handle)
+                return;
+
         all_events = ginfo->all_events;
         systems = ginfo->systems;
         events = ginfo->event_ids;
@@ -62,7 +121,8 @@ events_clicked (gpointer data)
 
 void trace_graph(int argc, char **argv)
 {
-        struct tracecmd_input *handle;
+        struct tracecmd_input *handle = NULL;
+        struct stat st;
         GtkWidget *window;
         GtkWidget *vbox;
         GtkWidget *hbox;
@@ -72,6 +132,7 @@ void trace_graph(int argc, char **argv)
         GtkWidget *sub_item;
         GtkWidget *widget;
         int c;
+        int ret;
 
         while ((c = getopt(argc, argv, "hi:")) != -1) {
                 switch(c) {
@@ -87,16 +148,14 @@ void trace_graph(int argc, char **argv)
                 }
         }
 
-        handle = tracecmd_open(input_file);
-
-        if (!handle)
-                die("error reading header");
-
-        if (tracecmd_read_headers(handle) < 0)
-                return;
+        if (!input_file) {
+                ret = stat(default_input_file, &st);
+                if (ret >= 0)
+                        input_file = default_input_file;
+        }
 
-        if (tracecmd_init_data(handle) < 0)
-                die("failed to init data");
+        if (input_file)
+                handle = read_tracecmd(input_file);
 
         gtk_init(&argc, &argv);
 
@@ -129,6 +188,22 @@ void trace_graph(int argc, char **argv)
         menu = gtk_menu_new();    /* Don't need to show menus */
 
 
+        /* --- File - Load Option --- */
+
+        sub_item = gtk_menu_item_new_with_label("Load info");
+
+        /* Add them to the menu */
+        gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
+
+        /* We can attach the Quit menu item to our exit function */
+        g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
+                                  G_CALLBACK (load_clicked),
+                                  (gpointer) ginfo);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
+
         /* --- File - Quit Option --- */
 
         sub_item = gtk_menu_item_new_with_label("Quit");
@@ -144,6 +219,7 @@ void trace_graph(int argc, char **argv)
         /* We do need to show menu items */
         gtk_widget_show(sub_item);
 
+
         gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
 
         /* --- end File options --- */
diff --git a/trace-graph.c b/trace-graph.c
index b478572..d31f7a5 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -560,6 +560,9 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
         struct graph_info *ginfo = data;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         if (event->button == 3)
                 return do_pop_up(widget, event, data);
 
@@ -606,6 +609,9 @@ info_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
         struct graph_info *ginfo = data;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         if (event->button != 1)
                 return FALSE;
 
@@ -630,6 +636,9 @@ info_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data
         GdkModifierType state;
         gint x, y;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         if (!ginfo->line_active)
                 return FALSE;
 
@@ -668,6 +677,9 @@ info_button_release_event(GtkWidget *widget, GdkEventMotion *event, gpointer dat
         struct graph_info *ginfo = data;
         gint x;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         x = event->x - ginfo->scrollwin->allocation.x - ginfo->info_scrollwin->allocation.x;
 
         activate_zoom(ginfo, x);
@@ -990,6 +1002,9 @@ motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
         gint x, y;
         gint cpu;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         update_with_backend(ginfo, ginfo->cpu_data_x, ginfo->cpu_data_y,
                             ginfo->cpu_data_w, ginfo->cpu_data_h);
         if (event->is_hint)
@@ -1188,7 +1203,6 @@ static void zoom_in_window(struct graph_info *ginfo, gint start, gint end)
 static gboolean
 value_changed(GtkWidget *widget, gpointer data)
 {
-//      struct graph_info *ginfo = data;
         GtkAdjustment *adj = GTK_ADJUSTMENT(widget);
 
         dprintf(2, "value = %f\n",
@@ -1295,6 +1309,9 @@ button_release_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
         struct graph_info *ginfo = data;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         activate_zoom(ginfo, event->x);
 
         return TRUE;
@@ -1305,6 +1322,9 @@ leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 {
         struct graph_info *ginfo = data;
 
+        if (!ginfo->handle)
+                return FALSE;
+
         update_with_backend(ginfo, ginfo->cpu_data_x, ginfo->cpu_data_y,
                             ginfo->cpu_data_w, ginfo->cpu_data_h);
 
@@ -1658,6 +1678,9 @@ static void draw_info(struct graph_info *ginfo,
         static int read_comms = 1;
         gint cpu;
 
+        if (!ginfo->handle)
+                return;
+
         ginfo->resolution = (gdouble)new_width / (gdouble)(ginfo->view_end_time -
                                                            ginfo->view_start_time);
 
@@ -1867,6 +1890,8 @@ destroy_event(GtkWidget *widget, gpointer data)
 {
         struct graph_info *ginfo = data;
 
+        trace_graph_free_info(ginfo);
+
         graph_free_systems(ginfo);
         graph_free_events(ginfo);
 
@@ -1920,20 +1945,16 @@ static void info_draw_cpu_label(struct graph_info *ginfo, gint cpu)
 static void info_draw_cpu_labels(struct graph_info *ginfo)
 {
         gint cpu;
-#if 0
-        clear_old_cpu_labels(ginfo);
-        ginfo->cpu_x = gtk_adjustment_get_value(ginfo->hadj) + 5;
-#endif
+
+        if (!ginfo->handle)
+                return;
 
         for (cpu = 0; cpu < ginfo->cpus; cpu++)
                 info_draw_cpu_label(ginfo, cpu);
 }
 
-static gboolean
-info_configure_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static void update_cpu_window(struct graph_info *ginfo)
 {
-        struct graph_info *ginfo = data;
-
         if (ginfo->info_pixmap)
                 g_object_unref(ginfo->info_pixmap);
 
@@ -1953,7 +1974,15 @@ info_configure_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 
         gtk_widget_set_size_request(ginfo->info, largest_cpu_label + 10,
                                     ginfo->draw_height);
-        
+}
+
+static gboolean
+info_configure_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+{
+        struct graph_info *ginfo = data;
+
+        update_cpu_window(ginfo);
+
         return TRUE;
 }
 
@@ -1984,28 +2013,93 @@ create_graph_info(struct graph_info *ginfo)
         return info;
 }
 
-struct graph_info *
-trace_graph_create_with_callbacks(struct tracecmd_input *handle,
-                                  struct graph_callbacks *cbs)
+void trace_graph_free_info(struct graph_info *ginfo)
 {
-        struct graph_info *ginfo;
+        tracecmd_close(ginfo->handle);
+        ginfo->handle = NULL;
+}
+
+static int load_handle(struct graph_info *ginfo,
+                       struct tracecmd_input *handle)
+{
+        struct record *record;
         unsigned long sec, usec;
         gint cpu;
 
-        ginfo = g_new0(typeof(*ginfo), 1);
-        g_assert(ginfo != NULL);
+        if (!handle)
+                return -1;
+
+        if (ginfo->handle)
+                trace_graph_free_info(ginfo);
 
         ginfo->handle = handle;
+
         ginfo->pevent = tracecmd_get_pevent(handle);
         ginfo->cpus = tracecmd_cpus(handle);
-
         ginfo->all_events = TRUE;
 
-        ginfo->callbacks = cbs;
-
         ginfo->start_time = -1ULL;
         ginfo->end_time = 0;
 
+        ginfo->draw_height = CPU_SPACE(ginfo->cpus);
+
+        for (cpu = 0; cpu < ginfo->cpus; cpu++) {
+                record = tracecmd_read_cpu_first(handle, cpu);
+                if (!record)
+                        continue;
+
+                if (record->ts < ginfo->start_time)
+                        ginfo->start_time = record->ts;
+
+                free_record(record);
+                record = tracecmd_read_cpu_last(handle, cpu);
+
+                if (record->ts > ginfo->end_time)
+                        ginfo->end_time = record->ts;
+                free_record(record);
+        }
+
+        convert_nano(ginfo->start_time, &sec, &usec);
+        dprintf(1, "start=%lu.%06lu ", sec, usec);
+
+        convert_nano(ginfo->end_time, &sec, &usec);
+        dprintf(1, "end=%lu.%06lu\n", sec, usec);
+
+        ginfo->view_start_time = ginfo->start_time;
+        ginfo->view_end_time = ginfo->end_time;
+
+        return 0;
+}
+
+int trace_graph_load_handle(struct graph_info *ginfo,
+                            struct tracecmd_input *handle)
+{
+
+        if (load_handle(ginfo, handle) < 0)
+                return -1;
+
+        update_cpu_window(ginfo);
+        redraw_graph(ginfo);
+
+        return 0;
+}
+
+struct graph_info *
+trace_graph_create_with_callbacks(struct tracecmd_input *handle,
+                                  struct graph_callbacks *cbs)
+{
+        struct graph_info *ginfo;
+
+        ginfo = g_new0(typeof(*ginfo), 1);
+        g_assert(ginfo != NULL);
+
+        if (handle)
+                load_handle(ginfo, handle);
+
+        ginfo->handle = handle;
+
+        ginfo->callbacks = cbs;
+
         ginfo->task_filter = filter_task_hash_alloc();
         ginfo->hide_tasks = filter_task_hash_alloc();
 
@@ -2017,7 +2111,7 @@ trace_graph_create_with_callbacks(struct tracecmd_input *handle,
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
         gtk_widget_show(ginfo->scrollwin);
-
+        ginfo->hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(ginfo->scrollwin));
 
         ginfo->info_scrollwin = gtk_scrolled_window_new(NULL,
                 gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(ginfo->scrollwin)));
@@ -2036,39 +2130,9 @@ trace_graph_create_with_callbacks(struct tracecmd_input *handle,
 
         gtk_box_pack_start(GTK_BOX (ginfo->widget), ginfo->scrollwin, TRUE, TRUE, 0);
 
-        ginfo->draw_height = CPU_SPACE(ginfo->cpus);
-        ginfo->hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(ginfo->scrollwin));
-
         gtk_signal_connect(GTK_OBJECT(ginfo->hadj), "value_changed",
                            (GtkSignalFunc) value_changed, ginfo);
 
-        for (cpu = 0; cpu < ginfo->cpus; cpu++) {
-                struct record *record;
-
-                record = tracecmd_read_cpu_first(handle, cpu);
-                if (!record)
-                        continue;
-
-                if (record->ts < ginfo->start_time)
-                        ginfo->start_time = record->ts;
-
-                free_record(record);
-                record = tracecmd_read_cpu_last(handle, cpu);
-
-                if (record->ts > ginfo->end_time)
-                        ginfo->end_time = record->ts;
-                free_record(record);
-        }
-
-        convert_nano(ginfo->start_time, &sec, &usec);
-        dprintf(1,"start=%lu.%06lu ", sec, usec);
-
-        convert_nano(ginfo->end_time, &sec, &usec);
-        dprintf(1, "end=%lu.%06lu\n", sec, usec);
-
-        ginfo->view_start_time = ginfo->start_time;
-        ginfo->view_end_time = ginfo->end_time;
-
         ginfo->draw = gtk_drawing_area_new();
 
         gtk_signal_connect(GTK_OBJECT(ginfo->draw), "expose_event",
diff --git a/trace-graph.h b/trace-graph.h
index 33e7355..7cfe0a2 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -114,5 +114,8 @@ void trace_graph_filter_add_remove_task(struct graph_info *info,
 void trace_graph_filter_hide_show_task(struct graph_info *ginfo,
                                        gint pid);
 void trace_graph_clear_tasks(struct graph_info *ginfo);
+void trace_graph_free_info(struct graph_info *ginfo);
+int trace_graph_load_handle(struct graph_info *ginfo,
+                            struct tracecmd_input *handle);
 
 #endif /* _TRACE_GRAPH_H */