Avoid unnecessary record parsing

4 files changed, 26 insertions, 15 deletions

diff --git a/rt-plot-cpu.c b/rt-plot-cpu.c
index 9a609e0..aa7b611 100644
--- a/rt-plot-cpu.c
+++ b/rt-plot-cpu.c
@@ -345,21 +345,25 @@ static int rt_cpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
 
         match = try_switch_away(ginfo, rtc_info, record, info) ||
                 try_switch_to(ginfo, rtc_info, record, info)   ||
-                try_completion(ginfo, rtc_info, record, info)  ||
                 try_sched_switch(ginfo, rtc_info, record, info);
 
+        if (is_high_res(ginfo)) {
+                match = match || try_completion(ginfo, rtc_info, record, info);
+
+        }
+
         if (!match) {
                 /* TODO: this should not be necessary!
                  * Have to call checks to ensure ids are loaded. Otherwise,
                  * is_displayed will not work here or in any other methods.
                  */
 #define ARG ginfo,record, &pid
-                rt_graph_check_task_param(ARG, &dull, &dull);
-                rt_graph_check_container_param(ARG, &dchar);
-                rt_graph_check_server_param(ARG, &dint, &dull, &dull);
-                rt_graph_check_task_release(ARG, &dint, &dull, &dull);
-                rt_graph_check_task_block(ARG, &dint, &dull);
-                rt_graph_check_task_resume(ARG, &dint,  &dull);
+                rt_graph_check_task_param(ARG, &dull, &dull) ||
+                rt_graph_check_container_param(ARG, &dchar)  ||
+                rt_graph_check_server_param(ARG, &dint, &dull, &dull) ||
+                rt_graph_check_task_release(ARG, &dint, &dull, &dull) ||
+                rt_graph_check_task_block(ARG, &dint, &dull)   ||
+                rt_graph_check_task_resume(ARG, &dint,  &dull) ||
                 rt_graph_check_any(ARG, &eid, &ts);
 #undef ARG
 
diff --git a/rt-plot-task.c b/rt-plot-task.c
index afb2bef..ec13313 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -473,12 +473,15 @@ rt_task_plot_record_matches(struct rt_plot_common *rt,
          */
 #define ARG ginfo, record, &pid
         match = rt_graph_check_switch_to(ARG, &dint, &dull)           ||
-                rt_graph_check_switch_away(ARG, &dint,  &dull)        ||
-                rt_graph_check_task_release(ARG, &dint, &dull, &dull) ||
-                rt_graph_check_task_completion(ARG, &dint, &dull)     ||
-                rt_graph_check_task_block(ARG, &dint, &dull)          ||
-                rt_graph_check_task_resume(ARG, &dint, &dull)         ||
-                rt_graph_check_any(ARG, &dint, &dull);
+                rt_graph_check_switch_away(ARG, &dint,  &dull);
+        if (is_high_res(ginfo)) {
+                match = match ||
+                        rt_graph_check_task_release(ARG, &dint, &dull, &dull) ||
+                        rt_graph_check_task_completion(ARG, &dint, &dull)     ||
+                        rt_graph_check_task_block(ARG, &dint, &dull)          ||
+                        rt_graph_check_task_resume(ARG, &dint, &dull)         ||
+                        rt_graph_check_any(ARG, &dint, &dull);
+        }
 #undef ARG
         return pid == match_pid;
 }
diff --git a/trace-graph.c b/trace-graph.c
index 2ad32a8..66c2722 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -92,7 +92,7 @@ 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)
+int is_high_res(struct graph_info *ginfo)
 {
         return convert_dist_to_time(ginfo, PLOT_TRI_SIZE) < MAX_TRI_TIME;
 }
@@ -1867,6 +1867,7 @@ static void draw_hashed_plots(struct graph_info *ginfo)
         struct record *record;
         struct plot_hash *hash;
         struct plot_list *list;
+        unsigned long long old_start;
 
         set_cpus_to_rts(ginfo, ginfo->view_start_time);
 
@@ -1899,8 +1900,9 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                         rt_graph_check_server_param(ARG, &dint, &dull, &dull);
 #undef ARG
                         if (rt_graph_check_sys_release(ginfo, record, &rel)) {
-                                dull = rel - .1 * (ginfo->view_end_time - rel);;
+                                dull = rel - .1 * (ginfo->view_end_time - rel);
                                 ginfo->rtg_info.start_time = get_rts(ginfo, record);
+                                //ginfo->view_end_time -= get_rts(ginfo, record) - ginfo->view_start_time;
                                 ginfo->view_start_time = get_rts(ginfo, record);
                                 if (first)
                                         return;
diff --git a/trace-graph.h b/trace-graph.h
index 67a8f35..b3eff57 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -427,6 +427,8 @@ void graph_plot_cpus_update_callback(gboolean accept,
                                      guint64 *selected_cpu_mask,
                                      gpointer data);
 
+int is_high_res(struct graph_info *ginfo);
+
 static inline void convert_nano(unsigned long long time, unsigned long *sec,
                                 unsigned long *usec)
 {