4 files changed, 30 insertions, 34 deletions

diff --git a/rt-plot-container.c b/rt-plot-container.c
index 136c51d..b21f9de 100644
--- a/rt-plot-container.c
+++ b/rt-plot-container.c
@@ -145,11 +145,8 @@ void rt_plot_container(struct graph_info *ginfo, int cid)
 
         cont->plotted = TRUE;
 
-        for (vlist = cont->vcpus; vlist; vlist = vlist->next) {
+        for (vlist = cont->vcpus; vlist; vlist = vlist->next)
                 insert_vcpu(ginfo, cont, vlist);
-                /* if (vlist->params.wcet && vlist->params.period) */
-                /*      insert_vtask(ginfo, cont, vlist); */
-        }
 }
 
 void rt_plot_add_all_containers(struct graph_info *ginfo)
diff --git a/rt-plot-task.c b/rt-plot-task.c
index 2acf18f..4dcbf9e 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -678,7 +678,7 @@ void rt_plot_task(struct graph_info *ginfo, int pid, int pos)
 void rt_plot_add_all_tasks(struct graph_info *ginfo)
  {
         gint *tasks;
-        int i, j, len, tmp;
+        int i, j, tmp;
         tasks = task_list_pids(ginfo->rtg_info.tasks);
 
         /* Awful sort */
diff --git a/rt-plot-vcpu.c b/rt-plot-vcpu.c
index 4045565..2c07d77 100644
--- a/rt-plot-vcpu.c
+++ b/rt-plot-vcpu.c
@@ -165,7 +165,8 @@ static int try_switch_away(struct graph_info *ginfo, struct vcpu_info *vcpu_info
         unsigned long long ts;
 
         match = rt_graph_check_switch_away(ginfo, record, &pid, &job, &ts);
-        if (match && pid && pid == vcpu_info->task_tid && vcpu_info->task_running) {
+        if (match && pid && vcpu_info->task_running &&
+            (pid == vcpu_info->task_tid || pid == -vcpu_info->task_tid)) {
                 update_task_label(vcpu_info, pid, job);
 
                 /* This server is no longer running a real task */
@@ -427,21 +428,20 @@ void insert_vcpu(struct graph_info *ginfo, struct cont_list *cont,
 
         g_assert(cont);
 
-
         len = strlen(cont->name) + 100;
         label = malloc_or_die(len);
 
         if (vcpu_info->params.wcet) {
                 vcpu->show_server = TRUE;
-                snprintf(label, len, "%s - %d\nServer %d\n(%1.1f, %1.1f)",
-                         cont->name, cont->cid, vcpu_info->sid,
+                snprintf(label, len, "%s-%d\n(%1.1f, %1.1f)",
+                         cont->name, -vcpu_info->sid,
                          nano_as_milli(vcpu_info->params.wcet),
                          nano_as_milli(vcpu_info->params.period));
         } else {
                 /* Always running, no need to see the server */
                 vcpu->show_server = FALSE;
-                snprintf(label, len, "%s - %d\nServer %d",
-                         cont->name, cont->cid, vcpu_info->sid);
+                snprintf(label, len, "%s-%d",
+                         cont->name, -vcpu_info->sid);
         }
 
         plot = trace_graph_plot_append(ginfo, label, PLOT_TYPE_SERVER_CPU,
diff --git a/trace-graph.c b/trace-graph.c
index f1a0486..7d4485b 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1949,31 +1949,30 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                         continue;
                 }
 
-
-                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
-                         * Should be an additional hashed list where things are
-                         * 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) {
+                        /* /\* TODO: hacky assumption that everything else can be */
+                        /*  * reached via previous hashes */
+                        /*  * Should be an additional hashed list where things are */
+                        /*  * 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) { */
                                 draw_plot(ginfo, list->plot, record);
-                        }
+                        /* } */
                 }
                 free_record(record);
         }