containers: virtual cpu drawing refinemenets

3 files changed, 38 insertions, 8 deletions

diff --git a/rt-plot-vcpu.c b/rt-plot-vcpu.c
index fb1cf8d..7951ad4 100644
--- a/rt-plot-vcpu.c
+++ b/rt-plot-vcpu.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "trace-graph.h"
 
-#define DEBUG_LEVEL 0
+#define DEBUG_LEVEL 4
 #if DEBUG_LEVEL > 0
 #define dprintf(l, x...)                        \
         do {                                    \
@@ -124,8 +124,7 @@ try_server_switch_away(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
         if (match && sid == vcpu_info->sid) {
                 update_tid(vcpu_info, tid);
 
-                if (vcpu_info->run_time && vcpu_info->run_time < ts &&
-                    job != 1) {
+                if (vcpu_info->run_time < ts) {
                         info->box = TRUE;
                         info->bcolor = hash_pid(tid);
                         info->bfill = vcpu_info->running;
@@ -214,13 +213,38 @@ static int try_switch_away(struct graph_info *ginfo, struct vcpu_info *vcpu_info
         return ret;
 }
 
-
 static void do_plot_end(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
                         struct plot_info *info)
 {
-        /* TODO: me */
-}
+        int tid, job, is_running;
+        unsigned long long deadline, release;
+        struct record *record;
 
+        if (vcpu_info->run_time && vcpu_info->run_cpu != NO_CPU) {
+                info->box = TRUE;
+                info->bcolor = hash_pid(vcpu_info->run_tid);
+                info->bfill = vcpu_info->running;
+                info->bstart = vcpu_info->run_time;
+                info->bend = ginfo->view_end_time;
+                info->blabel = vcpu_info->label;
+        } else if (vcpu_info->fresh) {
+                is_running = get_server_info(ginfo,
+                                             (struct rt_plot_common*)vcpu_info,
+                                             vcpu_info->sid,
+                                             ginfo->view_end_time,
+                                             &release, &deadline,
+                                             &job, &tid, &record);
+                if (is_running) {
+                        update_tid(vcpu_info, tid);
+                        info->box = TRUE;
+                        info->bcolor = hash_pid(vcpu_info->run_tid);
+                        info->bfill = is_task_running(ginfo, ginfo->view_end_time, tid);
+                        info->bstart = vcpu_info->run_time;
+                        info->bend = ginfo->view_end_time;
+                        info->blabel = vcpu_info->label;
+                }
+        }
+}
 
 static int rt_vcpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
                              struct record *record, struct plot_info *info)
@@ -261,8 +285,7 @@ static void rt_vcpu_plot_start(struct graph_info *ginfo, struct graph_plot *plot
         vcpu_info->fresh = TRUE;
         vcpu_info->running = FALSE;
 
-        vcpu_info->run_tid = -1;
-        update_tid(vcpu_info, 0);
+        vcpu_info->run_tid = 0;
 }
 
 static void rt_vcpu_plot_destroy(struct graph_info *ginfo, struct graph_plot *plot)
diff --git a/rt-plot-vcpu.h b/rt-plot-vcpu.h
index 14add34..9c50a63 100644
--- a/rt-plot-vcpu.h
+++ b/rt-plot-vcpu.h
@@ -6,13 +6,17 @@ struct vcpu_info {
         struct rt_plot_common   common;
 
         int                     sid;
+
         int                     run_tid;
         int                     run_cpu;
         unsigned long long      run_time;
+
         int                     block_cpu;
         unsigned long long      block_time;
+
         gboolean                fresh;
         gboolean                running;
+
         char                    *label;
 
         struct cont_list        *cont;
diff --git a/rt-plot.h b/rt-plot.h
index 0abc5c4..cae15ae 100644
--- a/rt-plot.h
+++ b/rt-plot.h
@@ -57,6 +57,9 @@ void set_cpu_to_rts(struct graph_info *ginfo,
                     unsigned long long rt_target, int cpu);
 void set_cpus_to_rts(struct graph_info *ginfo,
                      unsigned long long rt_target);
+int is_task_running(struct graph_info *ginfo,
+                    unsigned long long time,
+                    int pid);
 struct record* get_previous_release(struct graph_info *ginfo, int tid,
                                     unsigned long long time, int *job,
                                     unsigned long long *release,