rt-graph: usability improvements

1. Real-time CPUs are loaded at startup
2. A menu item for loading all real-time tasks is added
3. Black boxes appear around run times when zoomed in

7 files changed, 100 insertions, 39 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index dc5201c..6e41406 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -1308,6 +1308,15 @@ plot_rt_tasks_clicked (gpointer data)
         free(selected);
 }
 
+static void
+show_all_rt_clicked (gpointer data)
+{
+        struct shark_info *info = data;
+        struct graph_info *ginfo = info->ginfo;
+        rt_plot_add_all_tasks(ginfo);
+        trace_graph_refresh(ginfo);
+}
+
 
 /* Callback for the clicked signal of the help contents button */
 static void
@@ -2015,6 +2024,8 @@ void kernel_shark(int argc, char **argv)
         gtk_widget_show(sub_item);
 
 
+
+
         /* --- Filter - Graph Tasks Option --- */
 
         sub_item = gtk_menu_item_new_with_label("tasks");
@@ -2231,6 +2242,21 @@ void kernel_shark(int argc, char **argv)
         /* We do need to show menu items */
         gtk_widget_show(sub_item);
 
+        /* --- Plot - All RT Tasks Option --- */
+
+        sub_item = gtk_menu_item_new_with_label("Show All Real-Time Tasks");
+
+        /* 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 (show_all_rt_clicked),
+                                  (gpointer) info);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
         /* --- Plot - RT CPUs Option --- */
 
         sub_item = gtk_menu_item_new_with_label("Real-Time CPUs");
diff --git a/rt-graph.c b/rt-graph.c
index 0a72134..4aa06ac 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -1,7 +1,7 @@
 #include "trace-graph.h"
 #include "trace-hash.h"
 
-#define DEBUG_LEVEL 0
+#define DEBUG_LEVEL 3
 #if DEBUG_LEVEL > 0
 #define dprintf(l, x...)                        \
         do {                                    \
@@ -86,17 +86,17 @@ int rt_graph_check_any(struct rt_graph_info *rtg_info,
 
 /**
  * rt_graph_check_task_param - check for litmus_task_param record
- * Return 1 and @pid, @wcet, and @period if the record matches
+ * Return 1 and @pid, @out_wcet, and @out_period if the record matches
  */
 int rt_graph_check_task_param(struct rt_graph_info *rtg_info,
                               struct pevent *pevent, struct record *record,
-                              gint *pid, unsigned long long *wcet,
-                              unsigned long long *period)
+                              gint *pid, unsigned long long *out_wcet,
+                              unsigned long long *out_period)
 {
         struct event_format *event;
         struct rt_task_params *params;
         struct task_list *list;
-        unsigned long long val;
+        unsigned long long val, wcet, period;
         gint id;
         int ret = 0;
 
@@ -122,12 +122,12 @@ int rt_graph_check_task_param(struct rt_graph_info *rtg_info,
                                          record->data, &val);
                 *pid = val;
                 pevent_read_number_field(rtg_info->param_wcet_field,
-                                         record->data, wcet);
+                                         record->data, &wcet);
                 pevent_read_number_field(rtg_info->param_period_field,
-                                         record->data, period);
+                                         record->data, &period);
                 ret = 1;
                 dprintf(3, "Read task_param (%d) record for task %d "
-                        "(%llu, %llu)\n", id, *pid, *wcet, *period);
+                        "(%llu, %llu)\n", id, *pid, wcet, period);
 
                 list = add_task_hash(rtg_info->tasks, *pid);
                 if (!list->data) {
@@ -138,13 +138,15 @@ int rt_graph_check_task_param(struct rt_graph_info *rtg_info,
                          * Store them with the task to avoid this issue.
                          */
                         params = malloc_or_die(sizeof(*params));
-                        params->wcet = *wcet;
-                        params->period = *period;
+                        params->wcet = wcet;
+                        params->period = period;
                         list->data = params;
                 }
 
-                if (*period > rtg_info->max_period)
-                        rtg_info->max_period = *period;
+                if (period > rtg_info->max_period)
+                        rtg_info->max_period = period;
+                *out_wcet = wcet;
+                *out_period = period;
         }
  out:
         return ret;
diff --git a/rt-plot-cpu.c b/rt-plot-cpu.c
index 7b201dc..25c4ec9 100644
--- a/rt-plot-cpu.c
+++ b/rt-plot-cpu.c
@@ -74,10 +74,16 @@ __find_record(struct graph_info *ginfo, int cpu, unsigned long long time,
 
         while ((record = tracecmd_read_data(ginfo->handle, cpu))) {
                 ignored = 0;
-                if (display) {
-                        eid = pevent_data_type(ginfo->pevent, record);
+                eid = pevent_data_type(ginfo->pevent, record);
+
+                if (display)
                         ignored = !is_displayed(ginfo, eid);
-                }
+                else
+                        /* Without this ignore, the info popup is going
+                         * to be sched_switchs almost always.
+                         */
+                        ignored = (eid == ginfo->event_sched_switch_id);
+
                 if (get_rts(ginfo, record) >= time && !ignored)
                         break;
                 free_record(record);
@@ -342,11 +348,13 @@ static int rt_cpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
                  * is_displayed will not work here or in any other methods.
                  */
 #define ARG rtg_info, ginfo->pevent, record, &pid
+                rt_graph_check_task_param(ARG, &dull, &dull);
                 rt_graph_check_task_release(ARG, &dint, &dull, &dull);
                 rt_graph_check_task_block(ARG, &dull);
                 rt_graph_check_task_resume(ARG, &dull);
                 rt_graph_check_any(ARG, &eid, &ts);
 #undef ARG
+
                 if (is_displayed(ginfo, eid)) {
                         info->line = TRUE;
                         info->lcolor = hash_pid(pid);
@@ -427,6 +435,8 @@ rt_cpu_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
                                 trace_seq_putc(s, '\n');
                                 pevent_event_info(s, event, record);
                                 trace_seq_putc(s, '\n');
+                                if (!is_running)
+                                        trace_seq_putc(s, '\n');
                         } else
                                 trace_seq_printf(s, "UNKNOWN EVENT %d\n", eid);
                 }
@@ -554,9 +564,16 @@ void rt_plot_cpu(struct graph_info *ginfo, int cpu)
         rtc_info->cpu = cpu;
         rtc_info->label = malloc_or_die(LLABEL);
 
-        snprintf(label, 100, "*CPU %d", cpu);
+        snprintf(label, 100, "RT-CPU %d", cpu);
 
         plot = trace_graph_plot_append(ginfo, label, PLOT_TYPE_RT_CPU,
                                        TIME_TYPE_RT, &rt_cpu_cb, rtc_info);
         trace_graph_plot_add_all_recs(ginfo, plot);
 }
+
+void rt_plot_init_cpus(struct graph_info *ginfo, int cpus)
+{
+        long cpu;
+        for (cpu = 0; cpu < cpus; cpu++)
+                rt_plot_cpu(ginfo, cpu);
+}
diff --git a/rt-plot-cpu.h b/rt-plot-cpu.h
index eb63167..4af978d 100644
--- a/rt-plot-cpu.h
+++ b/rt-plot-cpu.h
@@ -17,5 +17,6 @@ void rt_plot_cpus_update_callback(gboolean accept,
                                   gboolean all_cpus,
                                   guint64 *selected_cpu_mask,
                                   gpointer data);
+void rt_plot_init_cpus(struct graph_info *ginfo, int cpus);
 
 #endif
diff --git a/rt-plot-task.c b/rt-plot-task.c
index 7132fb2..a5b475f 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -832,3 +832,12 @@ void rt_plot_task(struct graph_info *ginfo, int pid, int pos)
         free(plot_label);
         trace_graph_plot_add_all_recs(ginfo, plot);
 }
+
+void rt_plot_add_all_tasks(struct graph_info *ginfo)
+{
+        gint *tasks;
+        int i;
+        tasks = task_list_pids(ginfo->rtg_info.tasks);
+        for (i = 0; tasks[i] != -1; i++)
+                rt_plot_task(ginfo, tasks[i], ginfo->plots);
+}
diff --git a/rt-plot-task.h b/rt-plot-task.h
index ccbd208..a61a2b7 100644
--- a/rt-plot-task.h
+++ b/rt-plot-task.h
@@ -29,4 +29,6 @@ void rt_plot_task(struct graph_info *ginfo, int pid, int pos);
 void rt_plot_tasks_plotted(struct graph_info *ginfo, gint **plotted);
 void rt_plot_task_update_callback(gboolean accept, gint *selected,
                                   gint *non_select, gpointer data);
+void rt_plot_add_all_tasks(struct graph_info *ginfo);
+
 #endif
diff --git a/trace-graph.c b/trace-graph.c
index 42a0b27..76420d6 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -55,7 +55,7 @@
 #define PLOT_GIVE       2
 #define PLOT_BEGIN      80
 #define PLOT_SEP        50
-#define MAX_TRI_TIME    50000000
+#define MAX_TRI_TIME    20000000
 #define PLOT_LINE(plot) (PLOT_SEP * (plot) + PLOT_BEGIN + PLOT_SIZE)
 #define PLOT_TOP(plot) (PLOT_LINE(plot) - PLOT_SIZE * 2)
 #define PLOT_BOX_TOP(plot) (PLOT_LINE(plot) - PLOT_SIZE)
@@ -92,6 +92,12 @@ static int convert_dist_to_time(struct graph_info *ginfo, int dist)
         return convert_x_to_time(ginfo, dist) - convert_x_to_time(ginfo, 0);
 }
 
+static int is_high_res(struct graph_info *ginfo)
+{
+        return convert_dist_to_time(ginfo, PLOT_TRI_SIZE) < MAX_TRI_TIME;
+}
+
+
 static void print_time(unsigned long long time)
 {
         unsigned long sec, usec;
@@ -126,7 +132,6 @@ static void init_event_cache(struct graph_info *ginfo)
          * it into the pevent command line list.
          */
         ginfo->read_comms = TRUE;
-
         init_rt_event_cache(&ginfo->rtg_info);
 }
 
@@ -1642,7 +1647,7 @@ static gint draw_plot_line(struct graph_info *ginfo, int i,
         /* y = (small) ? PLOT_BOX_TOP(i) : PLOT_TOP(i); */
         y = PLOT_TOP(i);
 
-        if (!small || convert_dist_to_time(ginfo, PLOT_TRI_SIZE) < MAX_TRI_TIME) {
+        if (!small || is_high_res(ginfo)) {
                 gdk_draw_line(ginfo->curr_pixmap, gc,
                               x, y, x, PLOT_BOTTOM(i));
         }
@@ -1691,6 +1696,14 @@ static void draw_plot_box(struct graph_info *ginfo, int i,
                            fill,
                            x1, y,
                            x2 - x1, size);
+        if (is_high_res(ginfo)) {
+                gdk_draw_rectangle(ginfo->curr_pixmap,
+                                   ginfo->draw->style->black_gc,
+                                   FALSE,
+                                   x1, y,
+                                   x2 - x1, size);
+        }
+
         if (label)
                 draw_plot_label(ginfo, label, x1 + 1, y + 1, x2 - x1 - 2);
 }
@@ -1709,11 +1722,9 @@ static void draw_plot_release(struct graph_info *ginfo, int i,
         tpoints[2].x = x + PLOT_TRI_SIZE/2;
         tpoints[2].y = tbase;
 
-        if (convert_dist_to_time(ginfo, PLOT_TRI_SIZE) < MAX_TRI_TIME) {
-                gdk_draw_line(ginfo->curr_pixmap, gc,
-                              x, tbase, x, PLOT_BOX_BOTTOM(i));
-                gdk_draw_polygon(ginfo->curr_pixmap, gc, FALSE, tpoints, 3);
-        }
+        gdk_draw_line(ginfo->curr_pixmap, gc,
+                      x, tbase, x, PLOT_BOX_BOTTOM(i));
+        gdk_draw_polygon(ginfo->curr_pixmap, gc, FALSE, tpoints, 3);
 }
 
 static void draw_plot_deadline(struct graph_info *ginfo, int i,
@@ -1729,11 +1740,9 @@ static void draw_plot_deadline(struct graph_info *ginfo, int i,
         tpoints[2].x = x + PLOT_TRI_SIZE/2;
         tpoints[2].y = tbase;
 
-        if (convert_dist_to_time(ginfo, PLOT_TRI_SIZE) < MAX_TRI_TIME) {
-                gdk_draw_line(ginfo->curr_pixmap, gc,
-                              x, PLOT_BOX_TOP(i), x, tbase);
-                gdk_draw_polygon(ginfo->curr_pixmap, gc, FALSE, tpoints, 3);
-        }
+        gdk_draw_line(ginfo->curr_pixmap, gc,
+                      x, PLOT_BOX_TOP(i), x, tbase);
+        gdk_draw_polygon(ginfo->curr_pixmap, gc, FALSE, tpoints, 3);
 }
 
 static void draw_plot_completion(struct graph_info *ginfo, int i,
@@ -1749,9 +1758,7 @@ static void draw_plot_completion(struct graph_info *ginfo, int i,
         tpoints[2].x = x + PLOT_BTRI_SIZE/2;
         tpoints[2].y = tbase;
 
-        if (convert_dist_to_time(ginfo, PLOT_BTRI_SIZE) < MAX_TRI_TIME) {
-                gdk_draw_polygon(ginfo->curr_pixmap, gc, TRUE, tpoints, 3);
-        }
+        gdk_draw_polygon(ginfo->curr_pixmap, gc, TRUE, tpoints, 3);
 }
 
 static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
@@ -1790,7 +1797,7 @@ static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
                               info.bfill, info.bthin, info.blabel, plot->gc);
         }
 
-        if (info.release) {
+        if (info.release && is_high_res(ginfo)) {
                 if (plot->last_color != 0) {
                         plot->last_color = 0;
                         set_color(ginfo->draw, plot->gc, plot->last_color);
@@ -1798,7 +1805,7 @@ static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
                 draw_plot_release(ginfo, plot->pos, info.rtime, plot->gc);
         }
 
-        if (info.deadline) {
+        if (info.deadline && is_high_res(ginfo)) {
                 if (plot->last_color != 0) {
                         plot->last_color = 0;
                         set_color(ginfo->draw, plot->gc, plot->last_color);
@@ -1806,7 +1813,7 @@ static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
                 draw_plot_deadline(ginfo, plot->pos, info.dtime, plot->gc);
         }
 
-        if (info.completion) {
+        if (info.completion && is_high_res(ginfo)) {
                 if (plot->last_color != 0) {
                         plot->last_color = 0;
                         set_color(ginfo->draw, plot->gc, plot->last_color);
@@ -1924,8 +1931,6 @@ static void draw_plots(struct graph_info *ginfo, gint new_width)
         gint cpu;
         gint i;
 
-        printf("----Drawing plots----\n");
-
         /* Initialize plots */
         for (i = 0; i < ginfo->plots; i++) {
                 plot = ginfo->plot_array[i];
@@ -2502,7 +2507,7 @@ static int load_handle(struct graph_info *ginfo,
         ginfo->start_time = -1ULL;
         ginfo->end_time = 0;
 
-        graph_plot_init_cpus(ginfo, ginfo->cpus);
+        rt_plot_init_cpus(ginfo, ginfo->cpus);
 
         ginfo->draw_height = PLOT_SPACE(ginfo->plots);
 
@@ -2549,7 +2554,6 @@ void trace_graph_refresh(struct graph_info *ginfo)
         ginfo->draw_height = PLOT_SPACE(ginfo->plots);
         gtk_widget_set_size_request(ginfo->draw, ginfo->draw_width, ginfo->draw_height);
         update_label_window(ginfo);
-        printf("----Redrawing graph----\n");
         redraw_graph(ginfo);
 }