rt-graph: added real-time shapes to graph

3 files changed, 143 insertions, 14 deletions

diff --git a/rt-plot-task.c b/rt-plot-task.c
index 9e8ffe7..b6d794d 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -93,7 +93,7 @@ next_box_record(struct graph_info *ginfo, struct rt_task_info *rtt_info,
 static struct record*
 __find_record(struct graph_info *ginfo, gint pid, guint64 time, int display)
 {
-        int next_cpu, match, eid, is_sa = 0;
+        int next_cpu, match, eid, ignored= 0;
         struct record *record = NULL;
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
 
@@ -106,9 +106,15 @@ __find_record(struct graph_info *ginfo, gint pid, guint64 time, int display)
                 match = record_matches_pid(ginfo, record, pid);
                 if (display) {
                         eid = pevent_data_type(ginfo->pevent, record);
-                        is_sa = (eid == rtg_info->switch_away_id);
+                        ignored = (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);
                 }
-        } while (!(get_rts(ginfo, record) > time && match && !is_sa));
+                ignored = ignored && eid == ginfo->event_sched_switch_id;
+        } while (!(get_rts(ginfo, record) > time && match && !ignored));
 
         return record;
 }
@@ -358,12 +364,12 @@ static int try_resume(struct graph_info *ginfo, struct rt_task_info *rtt_info,
         match = rt_graph_check_task_resume(&ginfo->rtg_info, ginfo->pevent,
                                            record, &pid, &ts);
         if (match && pid == rtt_info->pid) {
-                /* info->box = TRUE; */
-                /* info->bcolor = 0x0; */
-                /* info->bfill = TRUE; */
-                /* info->bthin = TRUE; */
-                /* info->bstart = rtt_info->block_time; */
-                /* info->bend = ts; */
+                info->box = TRUE;
+                info->bcolor = 0x0;
+                info->bfill = TRUE;
+                info->bthin = TRUE;
+                info->bstart = rtt_info->block_time;
+                info->bend = ts;
                 rtt_info->fresh = FALSE;
 
                 rtt_info->block_time = 0ULL;
@@ -442,7 +448,8 @@ static int try_other(struct graph_info *ginfo, struct rt_task_info *rtt_info,
         my_pid = (pid == epid);
         my_cpu = (rtt_info->run_time && record->cpu == rtt_info->run_cpu);
         not_sa = (eid != ginfo->rtg_info.switch_away_id);
-        if (not_sa && (my_pid || my_cpu)) {
+        if (not_sa && (my_pid || my_cpu) &&
+            eid != ginfo->event_sched_switch_id) {
                 info->line = TRUE;
                 info->lcolor = hash_pid(record->cpu);
                 info->ltime = ts;
@@ -469,6 +476,13 @@ static void do_plot_end(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                 info->blabel = rtt_info->label;
         } else if (rtt_info->block_time && rtt_info->block_cpu != NO_CPU) {
                 /* Blocking happened */
+                info->box = TRUE;
+                info->bcolor = 0x0;
+                info->bfill = TRUE;
+                info->bthin = TRUE;
+                info->bstart = rtt_info->block_time;
+                info->bend = ginfo->view_end_time;
+                rtt_info->fresh = FALSE;
         } else if (rtt_info->fresh) {
                 /* Nothing happened!*/
                 record = next_box_record(ginfo, rtt_info,
@@ -484,6 +498,13 @@ static void do_plot_end(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                                 info->bend = ginfo->view_end_time;
                         } else if (eid == rtg_info->task_resume_id) {
                                 /* In a block */
+                                info->box = TRUE;
+                                info->bcolor = 0x0;
+                                info->bfill = TRUE;
+                                info->bthin = TRUE;
+                                info->bstart = ginfo->view_start_time;
+                                info->bend = ginfo->view_end_time;
+                                rtt_info->fresh = FALSE;
                         }
                         free_record(record);
                 }
@@ -614,6 +635,16 @@ static int rt_task_plot_display_info(struct graph_info *ginfo,
         if (record) {
                 rts = get_rts(ginfo, record);
                 eid = pevent_data_type(ginfo->pevent, record);
+
+                if (in_res(ginfo, deadline, time)) {
+                        trace_seq_printf(s, "litmus_deadline for %d:%d at %llu\n",
+                                         pid, job, deadline);
+                }
+                if (in_res(ginfo, release, time)) {
+                        trace_seq_printf(s, "litmus_release for %d:%d at %llu\n",
+                                         pid, job, release);
+                }
+
                 if (in_res(ginfo, rts, time)) {
                         event = pevent_data_event_from_type(ginfo->pevent, eid);
                         if (event) {
diff --git a/trace-graph.c b/trace-graph.c
index f3a5916..10e1d65 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -50,6 +50,8 @@
 
 #define PLOT_SIZE       10
 #define PLOT_BOX_SIZE   PLOT_SIZE
+#define PLOT_TRI_SIZE   PLOT_BOX_SIZE / 2
+#define PLOT_BTRI_SIZE  .75 * PLOT_BOX_SIZE
 #define PLOT_GIVE       2
 #define PLOT_BEGIN      80
 #define PLOT_SEP        50
@@ -1639,18 +1641,78 @@ static gint draw_plot_line(struct graph_info *ginfo, int i,
 static void draw_plot_box(struct graph_info *ginfo, int i,
                           unsigned long long start,
                           unsigned long long end,
-                          gboolean fill, GdkGC *gc)
+                          gboolean fill, gboolean thin,
+                          char *label, GdkGC *gc)
 {
         gint x1;
         gint x2;
+        gint y;
+        gint size;
 
         x1 = convert_time_to_x(ginfo, start);
         x2 = convert_time_to_x(ginfo, end);
 
+        size = (thin) ? PLOT_BOX_SIZE/4 : PLOT_BOX_SIZE;
+        y = PLOT_BOX_TOP(i) + (PLOT_BOX_SIZE - size)/2;
+
         gdk_draw_rectangle(ginfo->curr_pixmap, gc,
                            fill,
-                           x1, PLOT_BOX_TOP(i),
-                           x2 - x1, PLOT_BOX_SIZE);
+                           x1, y,
+                           x2 - x1, size);
+}
+
+static void draw_plot_release(struct graph_info *ginfo, int i,
+                              unsigned long long time, char *label, GdkGC *gc)
+{
+
+        int tbase = PLOT_TOP(i) + PLOT_TRI_SIZE;
+        int x = convert_time_to_x(ginfo, time);
+        GdkPoint tpoints[3];
+        tpoints[0].x = x;
+        tpoints[0].y = PLOT_TOP(i);
+        tpoints[1].x = x - PLOT_TRI_SIZE/2;
+        tpoints[1].y = tbase;
+        tpoints[2].x = x + PLOT_TRI_SIZE/2;
+        tpoints[2].y = tbase;
+
+        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,
+                               unsigned long long time, char *label, GdkGC *gc)
+{
+        int tbase = PLOT_BOX_BOTTOM(i);
+        int x = convert_time_to_x(ginfo, time);
+        GdkPoint tpoints[3];
+        tpoints[0].x = x;
+        tpoints[0].y = tbase + PLOT_TRI_SIZE;
+        tpoints[1].x = x - PLOT_TRI_SIZE/2;
+        tpoints[1].y = tbase;
+        tpoints[2].x = x + PLOT_TRI_SIZE/2;
+        tpoints[2].y = tbase;
+
+        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,
+                                 unsigned long long time, char *label,
+                                 GdkGC *gc)
+{
+        int tbase = PLOT_BOX_BOTTOM(i) + PLOT_BTRI_SIZE;
+        int x = convert_time_to_x(ginfo, time);
+        GdkPoint tpoints[3];
+        tpoints[0].x = x;
+        tpoints[0].y = tbase - PLOT_BTRI_SIZE;
+        tpoints[1].x = x - PLOT_BTRI_SIZE/2;
+        tpoints[1].y = tbase;
+        tpoints[2].x = x + PLOT_BTRI_SIZE/2;
+        tpoints[2].y = tbase;
+
+        gdk_draw_polygon(ginfo->curr_pixmap, gc, TRUE, tpoints, 3);
 }
 
 static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
@@ -1686,9 +1748,37 @@ static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
                 }
 
                 draw_plot_box(ginfo, plot->pos, info.bstart, info.bend,
-                              info.bfill, plot->gc);
+                              info.bfill, info.bthin, info.blabel, plot->gc);
+        }
+
+        if (info.release) {
+                if (plot->last_color != 0) {
+                        plot->last_color = 0;
+                        set_color(ginfo->draw, plot->gc, plot->last_color);
+                }
+                draw_plot_release(ginfo, plot->pos,
+                                  info.rtime, info.rlabel, plot->gc);
+        }
+
+        if (info.deadline) {
+                if (plot->last_color != 0) {
+                        plot->last_color = 0;
+                        set_color(ginfo->draw, plot->gc, plot->last_color);
+                }
+                draw_plot_deadline(ginfo, plot->pos,
+                                   info.dtime, info.dlabel, plot->gc);
         }
 
+        if (info.completion) {
+                if (plot->last_color != 0) {
+                        plot->last_color = 0;
+                        set_color(ginfo->draw, plot->gc, plot->last_color);
+                }
+                draw_plot_completion(ginfo, plot->pos,
+                                     info.ctime, info.dlabel, plot->gc);
+        }
+
+
         if (info.line) {
                 if (info.lcolor != plot->last_color) {
                         plot->last_color = info.lcolor;
diff --git a/trace-plot.c b/trace-plot.c
index 2fcd92f..2621034 100644
--- a/trace-plot.c
+++ b/trace-plot.c
@@ -344,6 +344,14 @@ int trace_graph_plot_event(struct graph_info *ginfo,
         info->box = FALSE;
         info->bfill = TRUE;
 
+        info->blabel = NULL;
+        info->release = FALSE;
+        info->rlabel = NULL;
+        info->deadline = FALSE;
+        info->dlabel = NULL;
+        info->completion = FALSE;
+        info->clabel = NULL;
+
         if (!plot->cb->plot_event)
                 return 0;