4 files changed, 75 insertions, 30 deletions

diff --git a/trace-graph.c b/trace-graph.c
index c16f313..7eaf506 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1721,7 +1721,6 @@ static void draw_info(struct graph_info *ginfo,
 
 void trace_graph_select_by_time(struct graph_info *ginfo, guint64 time)
 {
-        struct record *record = NULL;
         GtkAdjustment *vadj;
         gint view_start;
         gint view_width;
@@ -1729,7 +1728,8 @@ void trace_graph_select_by_time(struct graph_info *ginfo, guint64 time)
         gint mid;
         gint start;
         gint end;
-        gint cpu;
+        int ret;
+        gint i;
         guint64 old_start_time = ginfo->view_start_time;
 
         view_width = gtk_adjustment_get_page_size(ginfo->hadj);
@@ -1780,20 +1780,13 @@ void trace_graph_select_by_time(struct graph_info *ginfo, guint64 time)
          * If a record exists at this exact time value, we should
          * make sure that it is in view.
          */
-        for (cpu = 0; cpu < ginfo->cpus; cpu++) {
-                tracecmd_set_cpu_to_timestamp(ginfo->handle, cpu, time);
-                record = tracecmd_read_data(ginfo->handle, cpu);
-                while (record && record->ts < time) {
-                        free_record(record);
-                        record = tracecmd_read_data(ginfo->handle, cpu);
-                }
-                if (record && record->ts == time)
+        for (i = 0; i < ginfo->plots; i++) {
+                ret = trace_graph_plot_match_time(ginfo, ginfo->plot_array[i],
+                                                  time);
+                if (ret)
                         break;
-                free_record(record);
-                record = NULL;
         }
-        free_record(record);
-        if (cpu == ginfo->cpus)
+        if (i == ginfo->plots)
                 return;
 
         /* Make sure PLOT is visible */
@@ -1801,15 +1794,15 @@ void trace_graph_select_by_time(struct graph_info *ginfo, guint64 time)
         view_start = gtk_adjustment_get_value(vadj);
         view_width = gtk_adjustment_get_page_size(vadj);
 
-        if (PLOT_TOP(cpu) > view_start &&
-            PLOT_BOTTOM(cpu) < view_start + view_width)
+        if (PLOT_TOP(i) > view_start &&
+            PLOT_BOTTOM(i) < view_start + view_width)
                 return;
 
-        if (PLOT_TOP(cpu) < view_start)
-                gtk_adjustment_set_value(vadj, PLOT_TOP(cpu) - 5);
+        if (PLOT_TOP(i) < view_start)
+                gtk_adjustment_set_value(vadj, PLOT_TOP(i) - 5);
 
-        if (PLOT_BOTTOM(cpu) > view_start + view_width)
-                gtk_adjustment_set_value(vadj, (PLOT_BOTTOM(cpu) - view_width) + 10);
+        if (PLOT_BOTTOM(i) > view_start + view_width)
+                gtk_adjustment_set_value(vadj, (PLOT_BOTTOM(i) - view_width) + 10);
 }
 
 static void graph_free_systems(struct graph_info *ginfo)
diff --git a/trace-graph.h b/trace-graph.h
index 634707d..6035045 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -12,14 +12,24 @@ typedef void (graph_filter_cb)(struct graph_info *ginfo,
                                struct filter_task *task_filter,
                                struct filter_task *hide_tasks);
 
+struct graph_plot;
+
+/*
+ * match_time:
+ *   Return true if a selected time should expose plot.
+ *   Should only return true if an event has the exact time that
+ *   is passed in.
+ */
 struct plot_callbacks {
-        void                    *private;
+        int (*match_time)(struct graph_info *, struct graph_plot *,
+                          unsigned long long time);
 };
 
 struct graph_plot {
-        struct graph_plot       *next;
-        char                    *label;
-        struct plot_callbacks   *cb;
+        struct graph_plot               *next;
+        char                            *label;
+        const struct plot_callbacks     *cb;
+        void                            *private;
 };
 
 struct graph_callbacks {
@@ -154,7 +164,13 @@ int trace_graph_load_handle(struct graph_info *ginfo,
 void trace_graph_plot_free(struct graph_info *ginfo);
 void trace_graph_plot_init(struct graph_info *ginfo);
 void trace_graph_plot_append(struct graph_info *ginfo,
-                             const char *label, struct plot_callbacks *cb);
+                             const char *label, const struct plot_callbacks *cb,
+                             void *data);
+
+int trace_graph_plot_match_time(struct graph_info *ginfo,
+                                struct graph_plot *plot,
+                                unsigned long long time);
+
 
 /* cpu plot */
 void graph_plot_init_cpus(struct graph_info *ginfo, int cpus);
diff --git a/trace-plot-cpu.c b/trace-plot-cpu.c
index 31b88f1..d855c2c 100644
--- a/trace-plot-cpu.c
+++ b/trace-plot-cpu.c
@@ -1,14 +1,38 @@
 #include "trace-graph.h"
 
-static struct plot_callbacks cpu_plot_cb;
+static int cpu_plot_match_time(struct graph_info *ginfo, struct graph_plot *plot,
+                               unsigned long long time)
+{
+        struct record *record;
+        long cpu;
+        int ret = 0;
+
+        cpu = (long)plot->private;
+
+        tracecmd_set_cpu_to_timestamp(ginfo->handle, cpu, time);
+        record = tracecmd_read_data(ginfo->handle, cpu);
+        while (record && record->ts < time) {
+                free_record(record);
+                record = tracecmd_read_data(ginfo->handle, cpu);
+        }
+        if (record && record->ts == time)
+                ret = 1;
+        free_record(record);
+
+        return ret;
+}
+
+static const struct plot_callbacks cpu_plot_cb = {
+        .match_time              = cpu_plot_match_time
+};
 
 void graph_plot_init_cpus(struct graph_info *ginfo, int cpus)
 {
         char label[100];
-        int cpu;
+        long cpu;
 
         for (cpu = 0; cpu < cpus; cpu++) {
-                snprintf(label, 100, "CPU %d", cpu);
-                trace_graph_plot_append(ginfo, label, &cpu_plot_cb);
+                snprintf(label, 100, "CPU %ld", cpu);
+                trace_graph_plot_append(ginfo, label, &cpu_plot_cb, (void *)cpu);
         }
 }
diff --git a/trace-plot.c b/trace-plot.c
index 35d3352..152ff05 100644
--- a/trace-plot.c
+++ b/trace-plot.c
@@ -27,7 +27,8 @@ void trace_graph_plot_init(struct graph_info *ginfo)
 }
 
 void trace_graph_plot_append(struct graph_info *ginfo,
-                             const char *label, struct plot_callbacks *cb)
+                             const char *label, const struct plot_callbacks *cb,
+                             void *data)
 {
         struct graph_plot *plot;
         char *name;
@@ -41,6 +42,7 @@ void trace_graph_plot_append(struct graph_info *ginfo,
 
         plot->label = name;
         plot->cb = cb;
+        plot->private = data;
 
         plot->next = ginfo->plot_list;
         ginfo->plot_list = plot;
@@ -61,3 +63,13 @@ void trace_graph_plot_append(struct graph_info *ginfo,
 
         ginfo->plots++;
 }
+
+int trace_graph_plot_match_time(struct graph_info *ginfo,
+                                struct graph_plot *plot,
+                                unsigned long long time)
+{
+        if (!plot->cb->match_time)
+                return 0;
+
+        return plot->cb->match_time(ginfo, plot, time);
+}