rt-graph: cleanup of graph display

5 files changed, 85 insertions, 30 deletions

diff --git a/rt-plot-cpu.c b/rt-plot-cpu.c
index bc37df7..82d03e6 100644
--- a/rt-plot-cpu.c
+++ b/rt-plot-cpu.c
@@ -44,20 +44,53 @@ next_sa_record(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
         return ret;
 }
 
+static inline int
+is_displayed(struct graph_info *ginfo, int eid)
+{
+        struct rt_graph_info *rtg_info = &ginfo->rtg_info;
+        return !(eid == rtg_info->switch_away_id     ||
+                 eid == rtg_info->switch_to_id       ||
+                 eid == rtg_info->task_completion_id ||
+                 eid == rtg_info->task_block_id      ||
+                 eid == rtg_info->task_resume_id     ||
+                 eid == rtg_info->task_release_id    ||
+                 eid == ginfo->event_sched_switch_id);
+}
+
 static struct record*
-find_record(struct graph_info *ginfo, int cpu, unsigned long long time)
+__find_record(struct graph_info *ginfo, int cpu, unsigned long long time,
+              int display)
 {
-        struct record *record = NULL;
+        struct record *record;
+        int eid, ignored;
+
         set_cpu_to_rts(ginfo, time, cpu);
 
         while ((record = tracecmd_read_data(ginfo->handle, cpu))) {
-                if (get_rts(ginfo, record) >= time)
+                ignored = 0;
+                if (display) {
+                        eid = pevent_data_type(ginfo->pevent, record);
+                        ignored = !is_displayed(ginfo, eid);
+                }
+                if (get_rts(ginfo, record) >= time && !ignored)
                         break;
                 free_record(record);
         }
         return record;
 }
 
+static inline struct record*
+find_record(struct graph_info *ginfo, int cpu, guint64 time)
+{
+        return __find_record(ginfo, cpu, time, 0);
+}
+
+static inline struct record*
+find_display_record(struct graph_info *ginfo, int cpu, guint64 time)
+{
+        return __find_record(ginfo, cpu, time, 1);
+}
+
 
 static void update_pid(struct rt_cpu_info *rtc_info, int pid)
 {
@@ -79,7 +112,8 @@ try_switch_away(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
                                            record, &pid, &job, &ts);
         if (match) {
                 update_pid(rtc_info, pid);
-                if (rtc_info->rt_run_time && rtc_info->rt_run_time < ts) {
+                if (rtc_info->rt_run_time && rtc_info->rt_run_time < ts &&
+                    job != 1) {
                         info->box = TRUE;
                         info->bcolor = hash_pid(rtc_info->run_pid);
                         info->bfill = TRUE;
@@ -220,8 +254,8 @@ static void rt_cpu_plot_start(struct graph_info *ginfo, struct graph_plot *plot,
 static int rt_cpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
                              struct record *record, struct plot_info *info)
 {
-        int pid, eid, match;
-        unsigned long long ts;
+        int pid, eid, match, dint;
+        unsigned long long ts, dull;
         struct rt_cpu_info *rtc_info = plot->private;
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
 
@@ -239,11 +273,20 @@ static int rt_cpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
                 try_sched_switch(ginfo, rtc_info, record, info);
 
         if (!match) {
-                rt_graph_check_any(rtg_info, ginfo->pevent, record,
-                                   &pid, &eid, &ts);
-                info->line = TRUE;
-                info->lcolor = hash_pid(pid);
-                info->ltime = ts;
+                /* Have to call checks to ensure ids are loaded. Otherwise,
+                 * is_displayed will not work in any methods.
+                 */
+#define ARG rtg_info, ginfo->pevent, record, &pid
+                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);
+                        info->ltime = ts;
+                }
         }
         return 1;
 }
@@ -263,7 +306,7 @@ rt_cpu_plot_display_last_event(struct graph_info *ginfo, struct graph_plot *plot
         if (record)
                 offset = record->offset;
 
-        record = find_record(ginfo, cpu, time);
+        record = find_display_record(ginfo, cpu, time);
 
         if (offset)
                 tracecmd_set_cursor(ginfo->handle, cpu, offset);
@@ -351,7 +394,7 @@ rt_cpu_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
 
         if (is_running) {
                 comm = pevent_data_comm_from_pid(ginfo->pevent, pid);
-                trace_seq_printf(s, "%s-%d:%d\n", comm, pid, job);
+                trace_seq_printf(s, "%s-%d:%d\n\n", comm, pid, job);
         }
 
         if (record) {
@@ -360,16 +403,15 @@ rt_cpu_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
                         eid = pevent_data_type(ginfo->pevent, record);
                         event = pevent_data_event_from_type(ginfo->pevent, eid);
                         if (event) {
-                                trace_seq_putc(s, '\n');
                                 trace_seq_puts(s, event->name);
                                 trace_seq_putc(s, '\n');
                                 pevent_event_info(s, event, record);
+                                trace_seq_putc(s, '\n');
                         } else
-                                trace_seq_printf(s, "\nUNKNOWN EVENT %d\n", eid);
+                                trace_seq_printf(s, "UNKNOWN EVENT %d\n", eid);
                 }
                 free_record(record);
         }
-        trace_seq_putc(s, '\n');
         nano_to_milli(time, &msec, &nsec);
         trace_seq_printf(s, "%llu.%06llu ms CPU: %03d",
                          msec, nsec, rtc_info->cpu);
diff --git a/rt-plot-task.c b/rt-plot-task.c
index f8d29ed..947e2e9 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -83,18 +83,18 @@ next_box_record(struct graph_info *ginfo, struct rt_task_info *rtt_info,
 
 /*
  * Return first relevant record after @time.
- * @display: If set, only considers records which are plotted in some way
+ * @display: If set, only considers records which aren't plotted
  */
 static struct record*
 __find_record(struct graph_info *ginfo, gint pid, guint64 time, int display)
 {
-        int next_cpu, match, eid, ignored= 0;
-        struct record *record = NULL;
+        int next_cpu, match, eid, ignored;
+        struct record *record;
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
 
         set_cpus_to_rts(ginfo, time);
         while ((record = tracecmd_read_next_data(ginfo->handle, &next_cpu))) {
-                free_record(record);
+                ignored = 0;
                 match = record_matches_pid(ginfo, record, pid);
                 if (display) {
                         eid = pevent_data_type(ginfo->pevent, record);
@@ -105,9 +105,10 @@ __find_record(struct graph_info *ginfo, gint pid, guint64 time, int display)
                                    eid == rtg_info->task_resume_id ||
                                    eid == rtg_info->task_release_id);
                 }
-                ignored = ignored && eid == ginfo->event_sched_switch_id;
+                ignored = ignored || eid == ginfo->event_sched_switch_id;
                 if (get_rts(ginfo, record) >= time && match && !ignored)
                         break;
+                free_record(record);
         };
 
         return record;
@@ -318,9 +319,11 @@ static int try_completion(struct graph_info *ginfo,
         match = rt_graph_check_task_completion(&ginfo->rtg_info, ginfo->pevent,
                                                record, &pid, &job, &ts);
         if (match && pid == rtt_info->pid) {
-                update_job(rtt_info, job);
+