3 files changed, 22 insertions, 23 deletions

diff --git a/rt-graph.c b/rt-graph.c
index 5fa4aa4..e2f8b06 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -484,8 +484,8 @@ int rt_graph_check_task_block(struct graph_info *ginfo,
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
-                dprintf(3, "Read task_block (%d) record on %d for task %d\n",
-                        id, *lid, *pid);
+                dprintf(3, "Read task_block (%d) record on %d for task %d at %llu\n",
+                        id, *lid, *pid, *ts);
         }
  out:
         return ret;
@@ -524,14 +524,13 @@ int rt_graph_check_task_resume(struct graph_info *ginfo,
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
-                dprintf(3, "Read task_resume (%d) record on %d for task %d\n",
-                        id, *lid, *pid);
+                dprintf(3, "Read task_resume (%d) record on %d for task %d at %llu\n",
+                        id, *lid, *pid, *ts);
         }
  out:
         return ret;
 }
 
-
 /**
  * rt_graph_check_sys_release - check for system release record
  * Return 1 and @when if the record matches
diff --git a/rt-plot-vcpu.c b/rt-plot-vcpu.c
index 1467660..8f850b9 100644
--- a/rt-plot-vcpu.c
+++ b/rt-plot-vcpu.c
@@ -84,7 +84,7 @@ static int try_switch_to(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
         unsigned long long ts;
 
         match = rt_graph_check_switch_to(ginfo, record, &pid, &job, &ts);
-        if (match && pid && pid == vcpu_info->run_tid && vcpu_info->run_time) {
+        if (match && pid && (pid == vcpu_info->run_tid || pid == -vcpu_info->run_tid) && vcpu_info->run_time) {
                 vcpu_info->running = TRUE;
 
                 /* Draw empty box for time spent not running a task */
@@ -312,7 +312,7 @@ rt_vcpu_plot_write_header(struct rt_plot_common *rt,
                           struct trace_seq *s,
                           unsigned long long time)
 {
-        int is_running, job, tid, tjob;
+        int is_running, job = 0, tid, tjob;
         unsigned long long release, deadline;
         struct vcpu_info *vcpu_info = (struct vcpu_info*)rt;
         struct record *record;
diff --git a/trace-graph.c b/trace-graph.c
index 6a7f1ff..69f5069 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1940,19 +1940,19 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                 }
 
 
-                hash = trace_graph_plot_find_cpu(ginfo, cpu);
-                if (hash) {
-                        for (list = hash->plots; list; list = list->next) {
-                                draw_plot(ginfo, list->plot, record);
-                        }
-                }
-                pid = pevent_data_pid(ginfo->pevent, record);
-                hash = trace_graph_plot_find_task(ginfo, pid);
-                if (hash) {
-                        for (list = hash->plots; list; list = list->next) {
-                                draw_plot(ginfo, list->plot, record);
-                        }
-                }
+                /* hash = trace_graph_plot_find_cpu(ginfo, cpu); */
+                /* if (hash) { */
+                /*      for (list = hash->plots; list; list = list->next) { */
+                /*              draw_plot(ginfo, list->plot, record); */
+                /*      } */
+                /* } */
+                /* pid = pevent_data_pid(ginfo->pevent, record); */
+                /* hash = trace_graph_plot_find_task(ginfo, pid); */
+                /* if (hash) { */
+                /*      for (list = hash->plots; list; list = list->next) { */
+                /*              draw_plot(ginfo, list->plot, record); */
+                /*      } */
+                /* } */
                 for (list = ginfo->all_recs; list; list = list->next) {
                         /* TODO: hacky assumption that everything else can be
                          * reached via previous hashes
@@ -1960,10 +1960,10 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                          * added with arbitrary numbers, and a pevent_other_id
                          * which uses id ranges x < . < y to parse cids or lids
                          */
-                        if (list->plot->type == PLOT_TYPE_SERVER_TASK ||
-                            list->plot->type == PLOT_TYPE_SERVER_CPU) {
+                        /* if (list->plot->type == PLOT_TYPE_SERVER_TASK || */
+                        /*     list->plot->type == PLOT_TYPE_SERVER_CPU) { */
                                 draw_plot(ginfo, list->plot, record);
-                        }
+                        /* } */
                 }
                 free_record(record);
         }