rt-graph: cleanup of interface

4 files changed, 74 insertions, 61 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 6b6cdd4..924bcc8 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -2401,80 +2401,80 @@ void kernel_shark(int argc, char **argv)
         gtk_widget_show(widget);
 
 
-        /* --- Tree View Vbox --- */
+        /* /\* --- Tree View Vbox --- *\/ */
 
-        vbox2 = gtk_vbox_new(FALSE, 0);
-        gtk_paned_add2(GTK_PANED(vpaned), vbox2);
-        gtk_widget_show(vbox2);
+        /* vbox2 = gtk_vbox_new(FALSE, 0); */
+        /* gtk_paned_add2(GTK_PANED(vpaned), vbox2); */
+        /* gtk_widget_show(vbox2); */
 
-        /* --- Paging Hbox --- */
+        /* /\* --- Paging Hbox --- *\/ */
 
-        hbox = gtk_hbox_new(FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
-        gtk_widget_show(hbox);
+        /* hbox = gtk_hbox_new(FALSE, 0); */
+        /* gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); */
+        /* gtk_widget_show(hbox); */
 
-        /* --- Page Spin Button --- */
+        /* /\* --- Page Spin Button --- *\/ */
 
-        label = gtk_label_new("Page");
-        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-        gtk_widget_show(label);
+        /* label = gtk_label_new("Page"); */
+        /* gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); */
+        /* gtk_widget_show(label); */
 
-        spin = gtk_spin_button_new(NULL, 1.0, 0);
-        gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 1, 1);
-        gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
-        gtk_widget_show(spin);
+        /* spin = gtk_spin_button_new(NULL, 1.0, 0); */
+        /* gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 1, 1); */
+        /* gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); */
+        /* gtk_widget_show(spin); */
 
-        info->spin = spin;
+        /* info->spin = spin; */
 
-        /* --- Search --- */
+        /* /\* --- Search --- *\/ */
 
-        /* The tree needs its columns loaded now */
-        info->treeview = gtk_tree_view_new();
-        trace_view_load(info->treeview, handle, spin);
+        /* /\* The tree needs its columns loaded now *\/ */
+        /* info->treeview = gtk_tree_view_new(); */
+        /* trace_view_load(info->treeview, handle, spin); */
 
-        label = gtk_label_new("      Search: ");
-        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-        gtk_widget_show(label);
+        /* label = gtk_label_new("      Search: "); */
+        /* gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); */
+        /* gtk_widget_show(label); */
 
-        trace_view_search_setup(GTK_BOX(hbox), GTK_TREE_VIEW(info->treeview));
+        /* trace_view_search_setup(GTK_BOX(hbox), GTK_TREE_VIEW(info->treeview)); */
 
-        check = gtk_check_button_new_with_label("graph follows");
-        gtk_box_pack_start(GTK_BOX(hbox), check, TRUE, TRUE, 0);
-        gtk_widget_show(check);
+        /* check = gtk_check_button_new_with_label("graph follows"); */
+        /* gtk_box_pack_start(GTK_BOX(hbox), check, TRUE, TRUE, 0); */
+        /* gtk_widget_show(check); */
 
-        g_signal_connect_swapped (check, "toggled",
-                                  G_CALLBACK (graph_check_toggle),
-                                  (gpointer) info);
+        /* g_signal_connect_swapped (check, "toggled", */
+        /*                        G_CALLBACK (graph_check_toggle), */
+        /*                        (gpointer) info); */
 
 
-        /* --- Top Level Trace View Paging Hbox --- */
+        /* /\* --- Top Level Trace View Paging Hbox --- *\/ */
 
-        hbox = gtk_hbox_new(FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);
-        gtk_widget_show(hbox);
+        /* hbox = gtk_hbox_new(FALSE, 0); */
+        /* gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0); */
+        /* gtk_widget_show(hbox); */
 
-        /* --- Scroll Window --- */
-        scrollwin = gtk_scrolled_window_new(NULL, NULL);
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                       GTK_POLICY_AUTOMATIC,
-                                       GTK_POLICY_AUTOMATIC);
-        gtk_box_pack_start(GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
-        gtk_widget_show(scrollwin);
+        /* /\* --- Scroll Window --- *\/ */
+        /* scrollwin = gtk_scrolled_window_new(NULL, NULL); */
+        /* gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), */
+        /*                             GTK_POLICY_AUTOMATIC, */
+        /*                             GTK_POLICY_AUTOMATIC); */
+        /* gtk_box_pack_start(GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0); */
+        /* gtk_widget_show(scrollwin); */
 
-        /* --- Set up Trace Tree --- */
+        /* /\* --- Set up Trace Tree --- *\/ */
 
-        g_signal_connect(info->treeview, "row-activated",
-                         (GCallback)row_double_clicked, info);
+        /* g_signal_connect(info->treeview, "row-activated", */
+        /*               (GCallback)row_double_clicked, info); */
 
-        g_signal_connect(info->treeview, "cursor-changed",
-                         (GCallback)cursor_changed, info);
+        /* g_signal_connect(info->treeview, "cursor-changed", */
+        /*               (GCallback)cursor_changed, info); */
 
-        gtk_container_add(GTK_CONTAINER(scrollwin), info->treeview);
+        /* gtk_container_add(GTK_CONTAINER(scrollwin), info->treeview); */
 
-        gtk_signal_connect(GTK_OBJECT(info->treeview), "button_press_event",
-                           (GtkSignalFunc) button_press_event, info);
+        /* gtk_signal_connect(GTK_OBJECT(info->treeview), "button_press_event", */
+        /*                 (GtkSignalFunc) button_press_event, info); */
 
-        gtk_widget_show(info->treeview);
+        /* gtk_widget_show(info->treeview); */
 
         /* --- Set up Status Bar --- */
 
diff --git a/rt-graph.c b/rt-graph.c
index fbf61bd..e291245 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -462,6 +462,7 @@ int rt_graph_check_task_block(struct graph_info *ginfo,
                 if (!event)
                         goto out;
                 dprintf(2, "Found task_block id %d\n", event->id);
+                rtg_info->task_block_id = event->id;
                 STORE_FIELD(rtg_info, event, block, pid);
         }
 
@@ -498,6 +499,7 @@ int rt_graph_check_task_resume(struct graph_info *ginfo,
                 if (!event)
                         goto out;
                 dprintf(2, "Found task_resume id %d\n", event->id);
+                rtg_info->task_resume_id = event->id;
                 STORE_FIELD(rtg_info, event, resume, pid);
         }
 
diff --git a/rt-plot-task.c b/rt-plot-task.c
index 56c3c28..de5d2a7 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -3,7 +3,7 @@
 #include "trace-graph.h"
 #include "trace-filter.h"
 
-#define DEBUG_LEVEL 1
+#define DEBUG_LEVEL 5
 #if DEBUG_LEVEL > 0
 #define dprintf(l, x...)                        \
         do {                                    \
@@ -219,6 +219,8 @@ static int try_block(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                 dprintf(3, "Block for %d on %d at %llu\n",
                         pid, record->cpu, ts);
                 ret = 1;
+        } else {
+                dprintf(3, "%d does not match my pid %d\n", pid, rtt_info->pid);
         }
         return ret;
 }
diff --git a/rt-plot.c b/rt-plot.c
index 10f8b2d..36682a4 100644
--- a/rt-plot.c
+++ b/rt-plot.c
@@ -71,6 +71,9 @@ rt_plot_display_last_event(struct graph_info *ginfo, struct graph_plot *plot,
         return 1;
 }
 
+/*
+ * Return first displayed record before @time, abandoning search after @range.
+ */
 static struct record*
 find_prev_display_record(struct graph_info *ginfo, struct rt_plot_common *rt_info,
                  unsigned long long time, unsigned long long range)
@@ -120,15 +123,17 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
 {
         struct rt_plot_common *rt_info = plot->private;
         struct event_format *event;
-        struct record *record, *prev_record;
+        struct record *record, *prev_record, *data_record;
         unsigned long long msec, nsec, rts, ptime, rtime, range;
         long long pdiff, rdiff;
         int eid;
 
-        rt_info->write_header(rt_info, ginfo, s, time);
+        /* Write plot-specific data */
+        data_record = rt_info->write_header(rt_info, ginfo, s, time);
 
-        /* Stupid, fix to use resolution */
+        /* Select closest relevant record */
         range = 2 / ginfo->resolution;
+
         record = __find_rt_record(ginfo, rt_info, time, 1, range);
         prev_record = find_prev_display_record(ginfo, rt_info, time, range);
 
@@ -142,6 +147,7 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
                 record = (pdiff < rdiff) ? prev_record : record;
         }
 
+        /* Write event info */
         if (record) {
                 rts = get_rts(ginfo, record);
                 eid = pevent_data_type(ginfo->pevent, record);
@@ -155,16 +161,19 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
                                 pevent_event_info(s, event, record);
                         } else
                                 trace_seq_printf(s, "\nUNKNOWN EVENT %d\n", eid);
-                } else {
-                        trace_seq_printf(s, "Failsauce\n");
                 }
-                trace_seq_putc(s, '\n');
-                nano_to_milli(time, &msec, &nsec);
-                trace_seq_printf(s, "%llu.%06llu ms CPU: %03d",
-                                 msec, nsec, record->cpu);
                 free_record(record);
         }
 
+        /* Metadata */
+        trace_seq_putc(s, '\n');
+        nano_to_milli(time, &msec, &nsec);
+        trace_seq_printf(s, "%llu.%06llu ms", msec, nsec);
+        if (data_record) {
+                trace_seq_printf(s, " CPU: %03d", data_record->cpu);
+                free_record(data_record);
+        }
+
         return 1;
 }