8 files changed, 113 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index dc7100e..c57b409 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,7 @@ TRACE_GUI_OBJS = trace-filter.o trace-compat.o trace-hash.o trace-dialog.o \
 TRACE_CMD_OBJS = trace-cmd.o trace-record.o trace-read.o trace-split.o trace-listen.o \
          trace-stack.o trace-options.o
 TRACE_VIEW_OBJS = trace-view.o trace-view-store.o
-RT_GRAPH_OBJS = rt-graph.o rt-plot-task.o
+RT_GRAPH_OBJS = rt-graph.o rt-plot-task.o rt-plot-cpu.o
 TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o \
         trace-plot-cpu.o trace-plot-task.o \
         $(RT_GRAPH_OBJS) task-list.o
diff --git a/kernel-shark.c b/kernel-shark.c
index 1aaf149..ca1fcb8 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -1245,6 +1245,25 @@ plot_cpu_clicked (gpointer data)
         g_free(cpu_mask);
 }
 
+/* Callback for the clicked signal of the plot CPUs button */
+static void
+plot_rt_cpu_clicked (gpointer data)
+{
+        struct shark_info *info = data;
+        struct graph_info *ginfo = info->ginfo;
+        gboolean all_cpus;
+        guint64 *cpu_mask;
+
+        if (!ginfo->handle)
+                return;
+
+        rt_plot_cpus_plotted(ginfo, &all_cpus, &cpu_mask);
+
+        trace_filter_cpu_dialog(all_cpus, cpu_mask, ginfo->cpus,
+                                rt_plot_cpus_update_callback, ginfo);
+        g_free(cpu_mask);
+}
+
 /* Callback for the clicked signal of the plot tasks button */
 static void
 plot_tasks_clicked (gpointer data)
@@ -1289,6 +1308,7 @@ plot_rt_tasks_clicked (gpointer data)
         free(selected);
 }
 
+
 /* Callback for the clicked signal of the help contents button */
 static void
 help_content_clicked (gpointer data)
@@ -2211,6 +2231,21 @@ void kernel_shark(int argc, char **argv)
         /* 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");
+
+        /* 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 (plot_rt_cpu_clicked),
+                                  (gpointer) info);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
 
         /* --- End Plot Options --- */
         gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
diff --git a/rt-graph.h b/rt-graph.h
index aff8aca..cad1301 100644
--- a/rt-graph.h
+++ b/rt-graph.h
@@ -5,6 +5,10 @@
 #include "task-list.h"
 #include "trace-cmd.h"
 #include "rt-plot-task.h"
+#include "rt-plot-cpu.h"
+
+#define LLABEL 30
+#define SEARCH_PERIODS 3
 
 #define NO_CPU -1
 
diff --git a/rt-plot-task.c b/rt-plot-task.c
index 852f323..48bcdde 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -1,10 +1,7 @@
 #include "trace-graph.h"
 #include "trace-filter.h"
 
-#define LLABEL 30
-#define SEARCH_PERIODS 3
-
-#define DEBUG_LEVEL 3
+#define DEBUG_LEVEL 0
 #if DEBUG_LEVEL > 0
 #define dprintf(l, x...)                        \
         do {                                    \
@@ -59,12 +56,10 @@ next_box_record(struct graph_info *ginfo, struct rt_task_info *rtt_info,
         max_ts = ginfo->view_end_time +
                 SEARCH_PERIODS * rtg_info->max_period;
         set_cpus_to_rts(ginfo, time);
-        do {
-                free_record(record);
-                record = tracecmd_read_next_data(ginfo->handle, &cpu);
-                if (!record || get_rts(ginfo, record) > max_ts) {
+        while ((record = tracecmd_read_next_data(ginfo->handle, &cpu))) {
+                if (get_rts(ginfo, record) > max_ts) {
                         free_record(record);
-                        goto out;
+                        break;
                 }
 
                 /* Sorry mother */
@@ -79,10 +74,10 @@ next_box_record(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                 if (eid && pid == rtt_info->pid) {
                         ret = record;
                         *out_eid = eid;
-                        goto out;
+                        break;
                 }
-        } while (get_rts(ginfo, record) < max_ts);
- out:
+                free_record(record);
+        };
         return ret;
 }
 
@@ -561,8 +556,9 @@ static void rt_task_plot_destroy(struct graph_info *ginfo, struct graph_plot *pl
 {
         struct rt_task_info *rtt_info = plot->private;
         dprintf(4,"%s\n", __FUNCTION__);
+        trace_graph_plot_remove_all_recs(ginfo, plot);
         free(rtt_info->label);
-        task_plot_destroy(ginfo, plot);
+        free(rtt_info);
 }
 
 static int rt_task_plot_display_last_event(struct graph_info *ginfo,
@@ -716,8 +712,61 @@ void rt_plot_task_update_callback(gboolean accept,
                                   gint *non_select,
                                   gpointer data)
 {
-        graph_tasks_update_callback(PLOT_TYPE_RT_TASK, rt_plot_task,
-                                    accept, selected, non_select, data);
+        struct graph_info *ginfo = data;
+        struct rt_task_info *rtt_info;
+        struct graph_plot *plot;
+        gint select_size = 0;
+        gint *ptr;
+        int i;
+
+        if (!accept)
+                return;
+
+        /* The selected and non_select are sorted */
+        if (selected) {
+                for (i = 0; selected[i] >= 0; i++)
+                        ;
+                select_size = i;
+        }
+
+        /*
+         * Remove and add task plots.
+         * Go backwards, since removing a plot shifts the
+         * array from current position back.
+         */
+        for (i = ginfo->plots - 1; i >= 0; i--) {
+                plot = ginfo->plot_array[i];
+                if (plot->type != PLOT_TYPE_RT_TASK)
+                        continue;
+                rtt_info = plot->private;
+
+                /* If non are selected, then remove all */
+                if (!select_size) {
+                        trace_graph_plot_remove(ginfo, plot);
+                        continue;
+                }
+                ptr = bsearch(&rtt_info->pid, selected, select_size,
+                              sizeof(gint), id_cmp);
+                if (ptr) {
+                        /*
+                         * This plot plot already exists, remove it
+                         * from the selected array.
+                         */
+                        memmove(ptr, ptr + 1,
+                                (unsigned long)(selected + select_size) -
+                                (unsigned long)(ptr + 1));
+                        select_size--;
+                        continue;
+                }
+                /* Remove the plot */
+                trace_graph_plot_remove(ginfo, plot);
+        }
+
+        /* Now add any plots that need to be added */
+        for (i = 0; i < select_size; i++)
+                rt_plot_task(ginfo, selected[i], ginfo->plots);
+
+        trace_graph_refresh(ginfo);
 }
 
 void rt_plot_task_plotted(struct graph_info *ginfo, gint **plotted)
@@ -774,9 +823,5 @@ void rt_plot_task(struct graph_info *ginfo, int pid, int pos)
                                        TIME_TYPE_RT,
                                        &rt_task_cb, rtt_info);
         free(plot_label);
-
-        printf("Created plot for %s-%d / %d %p\n", comm, pid, rtt_info->pid,
-               rtt_info);
-
         trace_graph_plot_add_all_recs(ginfo, plot);
 }
diff --git a/trace-graph.c b/trace-graph.c
index 34c8268..5c364e4 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1846,6 +1846,7 @@ static void draw_ft_plots(struct graph_info *ginfo)
         struct plot_hash *hash;
         struct plot_list *list;
 
+
         tracecmd_set_all_cpus_to_timestamp(ginfo->handle,
                                            ginfo->view_start_time);
         while ((record = tracecmd_read_next_data(ginfo->handle, &cpu))) {
@@ -1874,6 +1875,7 @@ static void draw_ft_plots(struct graph_info *ginfo)
                                 draw_plot(ginfo, list->plot, record);
                         }
                 }
+                int stuff = 0;
                 for (list = ginfo->all_recs; list; list = list->next) {
                         if (list->plot->time != TIME_TYPE_FT)
                                 continue;
diff --git a/trace-graph.h b/trace-graph.h
index cfa5db7..ffd7cf5 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -42,6 +42,7 @@ enum graph_plot_type {
         PLOT_TYPE_CPU,
         PLOT_TYPE_TASK,
         PLOT_TYPE_RT_TASK,
+        PLOT_TYPE_RT_CPU,
 };
 
 enum plot_time_type {
diff --git a/trace-plot-task.c b/trace-plot-task.c
index 803d89b..096b792 100644
--- a/trace-plot-task.c
+++ b/trace-plot-task.c
@@ -739,12 +739,10 @@ void graph_plot_task_plotted(struct graph_info *ginfo,
         }
 }
 
-void graph_tasks_update_callback(enum graph_plot_type type,
-                                 plot_task_cb plot_cb,
-                                 gboolean accept,
-                                 gint *selected,
-                                 gint *non_select,
-                                 gpointer data)
+void graph_plot_task_update_callback(gboolean accept,
+                                     gint *selected,
+                                     gint *non_select,
+                                     gpointer data)
 {
         struct graph_info *ginfo = data;
         struct task_plot_info *task_info;
@@ -770,7 +768,7 @@ void graph_tasks_update_callback(enum graph_plot_type type,
          */
         for (i = ginfo->plots - 1; i >= 0; i--) {
                 plot = ginfo->plot_array[i];
-                if (plot->type != type)
+                if (plot->type != PLOT_TYPE_TASK)
                         continue;
                 task_info = plot->private;
 
@@ -798,20 +796,11 @@ void graph_tasks_update_callback(enum graph_plot_type type,
 
         /* Now add any plots that need to be added */
         for (i = 0; i < select_size; i++)
-                plot_cb(ginfo, selected[i], ginfo->plots);
+                graph_plot_task(ginfo, selected[i], ginfo->plots);
 
         trace_graph_refresh(ginfo);
 }
 
-void graph_plot_task_update_callback(gboolean accept,
-                                     gint *selected,
-                                     gint *non_select,
-                                     gpointer data)
-{
-        graph_tasks_update_callback(PLOT_TYPE_TASK, graph_plot_task,
-                                    accept, selected, non_select, data);
-}
-
 void graph_plot_init_tasks(struct graph_info *ginfo)
 {
         struct task_plot_info *task_info;
diff --git a/trace-plot-task.h b/trace-plot-task.h
index 11cb4f8..e5b9346 100644
--- a/trace-plot-task.h
+++ b/trace-plot-task.h
@@ -86,12 +86,4 @@ void graph_plot_task_update_callback(gboolean accept,
 
 void graph_plot_init_tasks(struct graph_info *ginfo);
 
-/* Shared functionality for inheriting structs */
-typedef void (plot_task_cb)(struct graph_info *ginfo, int pid, int pos);
-void graph_tasks_update_callback(enum graph_plot_type type,
-                                 plot_task_cb plot_cb,
-                                 gboolean accept,
-                                 gint *selected,
-                                 gint *non_select,
-                                 gpointer data);
 #endif