kernel-shark: Add callbacks from trace-graph for selection

Add a way for events in the trace graph to call back into the
kernel shark code. Implement the select first.

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

4 files changed, 62 insertions, 2 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 8fd16c9..ce4df11 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -36,6 +36,33 @@
 
 #define input_file "trace.dat"
 
+/* graph callbacks */
+
+/* convert_nano() and print_time() are copied from trace-graph.c for debugging
+   purposes, and should be deleted when this is complete (or merged with
+   trace-graph.c */
+
+static void convert_nano(unsigned long long time, unsigned long *sec,
+                         unsigned long *usec)
+{
+        *sec = time / 1000000000ULL;
+        *usec = (time / 1000) % 1000000;
+}
+
+static void print_time(unsigned long long time)
+{
+        unsigned long sec, usec;
+
+        convert_nano(time, &sec, &usec);
+        printf("%lu.%06lu", sec, usec);
+}
+
+static void ks_graph_select(struct graph_info *ginfo, guint64 cursor)
+{
+        printf("Cursor: ");
+        print_time(cursor);
+        printf(" selected\n");
+}
 
 /* Callback for the clicked signal of the Exit button */
 static void
@@ -211,7 +238,10 @@ void kernel_shark(int argc, char **argv)
 
         /* --- Set up Drawing --- */
 
-        info->ginfo = trace_graph_create(handle, GTK_SCROLLED_WINDOW(scrollwin));
+        info->graph_cbs.select = ks_graph_select;
+
+        info->ginfo = trace_graph_create_with_callbacks(handle, GTK_SCROLLED_WINDOW(scrollwin),
+                                                        &info->graph_cbs);
         draw = trace_graph_get_draw(info->ginfo);
 
         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
diff --git a/kernel-shark.h b/kernel-shark.h
index 58761b0..1e6302f 100644
--- a/kernel-shark.h
+++ b/kernel-shark.h
@@ -7,6 +7,7 @@
 struct shark_info {
         struct graph_info       *ginfo;
         GtkWidget               *treeview;
+        struct graph_callbacks  graph_cbs;
 };
 
 #endif /* _KERNEL_SHARK_H */
diff --git a/trace-graph.c b/trace-graph.c
index d97c4d1..15dfbd7 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -221,6 +221,8 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
                 ginfo->cursor = event->x / ginfo->resolution +
                         ginfo->view_start_time;
                 draw_cursor(ginfo);
+                if (ginfo->callbacks && ginfo->callbacks->select)
+                        ginfo->callbacks->select(ginfo, ginfo->cursor);
                 return TRUE;
         }
 
@@ -1150,7 +1152,8 @@ destroy_event(GtkWidget *widget, gpointer data)
 
 
 struct graph_info *
-trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
+trace_graph_create_with_callbacks(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin,
+                                  struct graph_callbacks *cbs)
 {
         struct graph_info *ginfo;
         unsigned long sec, usec;
@@ -1164,6 +1167,8 @@ trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
         ginfo->pevent = tracecmd_get_pevent(handle);
         ginfo->cpus = tracecmd_cpus(handle);
 
+        ginfo->callbacks = cbs;
+
         ginfo->start_time = -1ULL;
         ginfo->end_time = 0;
 
@@ -1223,3 +1228,9 @@ trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
 
         return ginfo;
 }
+
+struct graph_info *
+trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
+{
+        return trace_graph_create_with_callbacks(handle, scrollwin, NULL);
+}
diff --git a/trace-graph.h b/trace-graph.h
index dd5f58b..3f6de2d 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -3,6 +3,14 @@
 
 #include "trace-cmd.h"
 
+struct graph_info;
+
+typedef void (graph_select_cb)(struct graph_info *ginfo, guint64 time);
+
+struct graph_callbacks {
+        graph_select_cb         *select;
+};
+
 struct graph_info {
         struct tracecmd_input   *handle;
         struct pevent           *pevent;
@@ -32,6 +40,8 @@ struct graph_info {
         gint                    full_width;     /* width of full trace in pixels */
                                                 /* This includes non visible part of trace */
 
+        struct graph_callbacks  *callbacks;     /* call back hooks for changes to graph */
+
         /* Box info for CPU data info window */
         gint                    cpu_data_x;
         gint                    cpu_data_y;
@@ -48,10 +58,18 @@ struct graph_info {
 
 struct graph_info *
 trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin);
+struct graph_info *
+trace_graph_create_with_callbacks(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin,
+                                  struct graph_callbacks *cbs);
 
 static inline GtkWidget *trace_graph_get_draw(struct graph_info *ginfo)
 {
         return ginfo->draw;
 }
 
+static inline struct graph_callbacks *trace_graph_get_callbacks(struct graph_info *ginfo)
+{
+        return ginfo->callbacks;
+}
+
 #endif /* _TRACE_GRAPH_H */