rt-graph: blockign with ids

9 files changed, 177 insertions, 98 deletions

diff --git a/rt-graph.c b/rt-graph.c
index e291245..3a5949c 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -448,7 +448,8 @@ int rt_graph_check_task_completion(struct graph_info *ginfo,
  */
 int rt_graph_check_task_block(struct graph_info *ginfo,
                               struct record *record,
-                              gint *pid, unsigned long long *ts)
+                              gint *pid, gint *lid,
+                              unsigned long long *ts)
 {
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         struct pevent *pevent = ginfo->pevent;
@@ -464,16 +465,18 @@ int rt_graph_check_task_block(struct graph_info *ginfo,
                 dprintf(2, "Found task_block id %d\n", event->id);
                 rtg_info->task_block_id = event->id;
                 STORE_FIELD(rtg_info, event, block, pid);
+                STORE_FIELD(rtg_info, event, block, lid);
         }
 
         id = pevent_data_type(pevent, record);
         if (id == rtg_info->task_block_id) {
                 LOAD_INT(rtg_info, record, block, pid, pid);
+                LOAD_INT(rtg_info, record, block, lid, lid);
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
-                dprintf(3, "Read task_block (%d) record for task %d\n",
-                        id, *pid);
+                dprintf(3, "Read task_block (%d) record on %d for task %d\n",
+                        id, *lid, *pid);
         }
  out:
         return ret;
@@ -485,7 +488,8 @@ int rt_graph_check_task_block(struct graph_info *ginfo,
  */
 int rt_graph_check_task_resume(struct graph_info *ginfo,
                                struct record *record,
-                               gint *pid, unsigned long long *ts)
+                               gint *pid, gint *lid,
+                               unsigned long long *ts)
 {
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         struct pevent *pevent = ginfo->pevent;
@@ -501,16 +505,18 @@ int rt_graph_check_task_resume(struct graph_info *ginfo,
                 dprintf(2, "Found task_resume id %d\n", event->id);
                 rtg_info->task_resume_id = event->id;
                 STORE_FIELD(rtg_info, event, resume, pid);
+                STORE_FIELD(rtg_info, event, resume, lid);
         }
 
         id = pevent_data_type(pevent, record);
         if (id == rtg_info->task_resume_id) {
                 LOAD_INT(rtg_info, record, resume, pid, pid);
+                LOAD_INT(rtg_info, record, resume, lid, lid);
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
-                dprintf(3, "Read task_resume (%d) record for task %d\n",
-                        id, *pid);
+                dprintf(3, "Read task_resume (%d) record on %d for task %d\n",
+                        id, *lid, *pid);
         }
  out:
         return ret;
@@ -781,7 +787,8 @@ int rt_graph_check_server_completion(struct graph_info *ginfo,
  */
 int rt_graph_check_server_block(struct graph_info *ginfo,
                                 struct record *record,
-                                gint *sid, unsigned long long *ts)
+                                gint *sid, gint *lid,
+                                unsigned long long *ts)
 {
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         struct pevent *pevent = ginfo->pevent;
@@ -795,12 +802,15 @@ int rt_graph_check_server_block(struct graph_info *ginfo,
                 if (!event)
                         goto out;
                 dprintf(2, "Found server_block id %d\n", event->id);
+                rtg_info->server_block_id = event->id;
                 STORE_FIELD(rtg_info, event, sblock, sid);
+                STORE_FIELD(rtg_info, event, sblock, lid);
         }
 
         id = pevent_data_type(pevent, record);
         if (id == rtg_info->server_block_id) {
                 LOAD_INT(rtg_info, record, sblock, sid, sid);
+                LOAD_INT(rtg_info, record, sblock, lid, lid);
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
@@ -816,7 +826,8 @@ int rt_graph_check_server_block(struct graph_info *ginfo,
  */
 int rt_graph_check_server_resume(struct graph_info *ginfo,
                                  struct record *record,
-                                 gint *sid, unsigned long long *ts)
+                                 gint *sid, gint *lid,
+                                 unsigned long long *ts)
 {
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         struct pevent *pevent = ginfo->pevent;
@@ -830,12 +841,15 @@ int rt_graph_check_server_resume(struct graph_info *ginfo,
                 if (!event)
                         goto out;
                 dprintf(2, "Found server_resume id %d\n", event->id);
+                rtg_info->server_resume_id = event->id;
                 STORE_FIELD(rtg_info, event, sresume, sid);
+                STORE_FIELD(rtg_info, event, sresume, lid);
         }
 
         id = pevent_data_type(pevent, record);
         if (id == rtg_info->server_resume_id) {
                 LOAD_INT(rtg_info, record, sresume, sid, sid);
+                LOAD_INT(rtg_info, record, sresume, lid, lid);
                 *ts = get_rts(ginfo, record);
 
                 ret = 1;
diff --git a/rt-graph.h b/rt-graph.h
index 27aeb88..c44cf5b 100644
--- a/rt-graph.h
+++ b/rt-graph.h
@@ -56,9 +56,11 @@ struct rt_graph_info {
 
         gint                    task_block_id;
         struct format_field     *block_pid_field;
+        struct format_field     *block_lid_field;
 
         gint                    task_resume_id;
         struct format_field     *resume_pid_field;
+        struct format_field     *resume_lid_field;
 
         gint                    container_param_id;
         struct format_field     *cparam_cid_field;
@@ -92,9 +94,11 @@ struct rt_graph_info {
 
         gint                    server_block_id;
         struct format_field     *sblock_sid_field;
+        struct format_field     *sblock_lid_field;
 
         gint                    server_resume_id;
         struct format_field     *sresume_sid_field;
+        struct format_field     *sresume_lid_field;
 
 
         /* Cache of ts fields for non-litmus events */
@@ -163,10 +167,10 @@ int rt_graph_check_task_completion(struct graph_info *ginfo,
                                    struct record *record, gint *pid, gint *job,
                                    unsigned long long *when);
 int rt_graph_check_task_block(struct graph_info *ginfo,
-                              struct record *record, gint *pid,
+                              struct record *record, gint *pid, gint *lid,
                               unsigned long long *when);
 int rt_graph_check_task_resume(struct graph_info *ginfo, struct record *record,
-                               gint *pid, unsigned long long *when);
+                               gint *pid, gint *lid, unsigned long long *when);
 int rt_graph_check_container_param(struct graph_info *ginfo,
                                    struct record *record,
                                    gint *cid, char **name);
@@ -192,10 +196,10 @@ int rt_graph_check_server_completion(struct graph_info *ginfo,
                                      gint *sid, gint *job,
                                      unsigned long long *when);
 int rt_graph_check_server_block(struct graph_info *ginfo,
-                                struct record *record, gint *pid,
+                                struct record *record, gint *pid, gint *lid,
                                 unsigned long long *when);
 int rt_graph_check_server_resume(struct graph_info *ginfo, struct record *record,
-                                 gint *pid, unsigned long long *when);
+                                 gint *pid, gint *lid, unsigned long long *when);
 void init_rt_event_cache(struct rt_graph_info *rtinfo);
 
 unsigned long long get_rts(struct graph_info *ginfo,
diff --git a/rt-plot-cpu.c b/rt-plot-cpu.c
index 28ae26b..ba380fb 100644
--- a/rt-plot-cpu.c
+++ b/rt-plot-cpu.c
@@ -276,6 +276,9 @@ static void do_plot_end(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
         int pid;
         struct record *record;
 
+        if (ginfo->view_end_time == ginfo->end_time)
+                return;
+
         if (rtc_info->rt_run_time && rtc_info->run_pid) {
                 info->box = TRUE;
                 info->bcolor = hash_pid(rtc_info->run_pid);
@@ -359,8 +362,8 @@ static int rt_cpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
                 rt_graph_check_container_param(ARG, &dchar);
                 rt_graph_check_server_param(ARG, &dint, &dull, &dull);
                 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_task_block(ARG, &dint, &dull);
+                rt_graph_check_task_resume(ARG, &dint,  &dull);
                 rt_graph_check_any(ARG, &eid, &ts);
 #undef ARG
 
diff --git a/rt-plot-task.c b/rt-plot-task.c
index de5d2a7..94c60f1 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -42,8 +42,8 @@ next_box_record(struct graph_info *ginfo, struct rt_task_info *rtt_info,
 #define ARG ginfo, record, &pid
                 match = rt_graph_check_switch_to(ARG, &dint, &dull)   ||
                         rt_graph_check_switch_away(ARG, &dint, &dull) ||
-                        rt_graph_check_task_block(ARG, &dull)         ||
-                        rt_graph_check_task_resume(ARG, &dull);
+                        rt_graph_check_task_block(ARG, &dint, &dull)  ||
+                        rt_graph_check_task_resume(ARG, &dint, &dull);
 #undef ARG
                 eid = (match) ? pevent_data_type(pevent, record) : 0;
 
@@ -75,6 +75,19 @@ static int update_job(struct rt_task_info *rtt_info, int job)
         return 1;
 }
 
+static void update_lid(struct rt_task_info *rtt_info, int lid)
+{
+        if (rtt_info->block_lid != lid) {
+                rtt_info->block_lid = lid;
+
+                if (lid)
+                        snprintf(rtt_info->block_label, LLABEL,
+                                 "%d", rtt_info->block_lid);
+                else
+                        snprintf(rtt_info->block_label, LLABEL, " ");
+        }
+}
+
 static int rt_task_plot_is_drawn(struct graph_info *ginfo, int eid)
 {
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
@@ -82,8 +95,8 @@ static int rt_task_plot_is_drawn(struct graph_info *ginfo, int eid)
         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_block_id      ||
+                eid == rtg_info->task_resume_id     ||
                 eid == rtg_info->task_release_id);
 }
 
@@ -208,14 +221,19 @@ static int try_completion(struct graph_info *ginfo,
 static int try_block(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                      struct record *record, struct plot_info *info)
 {
-        int pid, match, ret = 0;
+        int pid, match, lid, ret = 0;
         unsigned long long ts;
 
-        match = rt_graph_check_task_block(ginfo, record, &pid, &ts);
+        match = rt_graph_check_task_block(ginfo, record, &pid, &lid, &ts);
         if (match && pid == rtt_info->pid) {
-                rtt_info->fresh = FALSE;
-                rtt_info->block_time = ts;
-                rtt_info->block_cpu = record->cpu;
+                if (lid || !rtt_info->block_lid) {
+                        update_lid(rtt_info, lid);
+                        rtt_info->fresh = FALSE;
+                        rtt_info->block_time = ts;
+                        rtt_info->block_cpu = record->cpu;
+                        rtt_info->block_lid = lid;
+                }
+
                 dprintf(3, "Block for %d on %d at %llu\n",
                         pid, record->cpu, ts);
                 ret = 1;
@@ -228,24 +246,34 @@ static int try_block(struct graph_info *ginfo, struct rt_task_info *rtt_info,
 static int try_resume(struct graph_info *ginfo, struct rt_task_info *rtt_info,
                       struct record *record, struct plot_info *info)
 {
-        int pid, match, ret = 0;
+        int pid, match, lid, ret = 0;
         unsigned long long ts;
 
-        match = rt_graph_check_task_resume(ginfo, record, &pid, &ts);
+        match = rt_graph_check_task_resume(ginfo, record, &pid, &lid, &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;
-                rtt_info->fresh = FALSE;
+                if (lid == rtt_info->block_lid) {
+                        info->box = TRUE;
+                        info->bcolor = 0x0;
+                        info->bfill = TRUE;
+                        info->bthin = TRUE;
+                        info->bstart = rtt_info->block_time;
+                        info->bend = ts;
+
+                        printf("drawing block\n");
+                        if (lid) {
+                                printf("Adding label %s\n", rtt_info->block_label);
+                                info->blabel = rtt_info->block_label;
+                        }
+
+                        rtt_info->block_lid = 0;
+                        rtt_info->fresh = FALSE;
+                        rtt_info->block_time = 0ULL;
+                        rtt_info->block_cpu = NO_CPU;
+
+                }
 
-                rtt_info->block_time = 0ULL;
-                rtt_info->block_cpu = NO_CPU;
                 dprintf(3, "Resume for %d on %d at %llu\n",
                         pid, record->cpu, ts);
-
                 ret = 1;
         }
         return ret;
@@ -335,6 +363,9 @@ static void do_plot_end(struct graph_info *ginfo, struct rt_task_info *rtt_info,
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         int eid;
 
+        if (ginfo->view_end_time == ginfo->end_time)
+                return;
+
         if (rtt_info->run_time && rtt_info->run_cpu != NO_CPU) {
                 /* A box was started, finish it */
                 info->box = TRUE;
@@ -424,6 +455,7 @@ static void rt_task_plot_start(struct graph_info *ginfo, struct graph_plot *plot
                 rtt_info->first_rels[i] = 0ULL;
         rtt_info->last_job = -1;
         update_job(rtt_info, 0);
+        update_lid(rtt_info, 0);
 }
 
 static void rt_task_plot_destroy(struct graph_info *ginfo, struct graph_plot *plot)
@@ -455,8 +487,8 @@ rt_task_plot_record_matches(struct rt_plot_common *rt,
                 rt_graph_check_switch_away(ARG, &dint,  &dull)        ||
                 rt_graph_check_task_release(ARG, &dint, &dull, &dull) ||
                 rt_graph_check_task_completion(ARG, &dint, &dull)     ||
-                rt_graph_check_task_block(ARG, &dull)                 ||
-                rt_graph_check_task_resume(ARG, &dull)                ||
+                rt_graph_check_task_block(ARG, &dint, &dull)          ||
+                rt_graph_check_task_resume(ARG, &dint, &dull)         ||
                 rt_graph_check_any(ARG, &dint, &dull);
 #undef ARG
         return pid == match_pid;
@@ -617,6 +649,7 @@ void rt_plot_task(struct graph_info *ginfo, int pid, int pos)
         rtt_info = malloc_or_die(sizeof(*rtt_info));
         rtt_info->pid = pid;
         rtt_info->label = malloc_or_die(LLABEL);
+        rtt_info->block_label = malloc_or_die(LLABEL);
         rtt_info->wcet = params->wcet;
         rtt_info->period = params->period;
 
diff --git a/rt-plot-task.h b/rt-plot-task.h
index ddbfb1c..0056434 100644
--- a/rt-plot-task.h
+++ b/rt-plot-task.h
@@ -13,8 +13,10 @@ struct rt_task_info {
         /* For drawing squares */
         unsigned long long      run_time;
         int                     run_cpu;
+
         unsigned long long      block_time;
         int                     block_cpu;
+        int                     block_lid;
 
         /* For managing state */
         int                     last_job;
@@ -25,6 +27,7 @@ struct rt_task_info {
         gboolean                params_found;
         gboolean                fresh;
         char                    *label;
+        char                    *block_label;
 };
 
 const struct plot_callbacks rt_task_cb;
diff --git a/rt-plot-vcpu.c b/rt-plot-vcpu.c
index 54dc05f..f327f57 100644
--- a/rt-plot-vcpu.c
+++ b/rt-plot-vcpu.c
@@ -131,6 +131,9 @@ static void do_plot_end(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
         unsigned long long deadline, release;
         struct record *record;
 
+        if (ginfo->view_end_time == ginfo->end_time)
+                return;
+
         if (vcpu_info->run_time && vcpu_info->run_cpu != NO_CPU) {
                 info->box = TRUE;
                 info->bcolor = hash_pid(vcpu_info->run_tid);
@@ -170,8 +173,8 @@ static int rt_vcpu_plot_event(struct graph_info *ginfo, struct graph_plot *plot,
 
         match = try_server_switch_away(ginfo, vcpu_info, record, info) ||
                 try_server_switch_to(ginfo, vcpu_info, record, info) ||
-                vcpu_try_block(ginfo, vcpu_info, record, info) ||
-                vcpu_try_resume(ginfo, vcpu_info, record, info) ||
+                /* vcpu_try_block(ginfo, vcpu_info, record, info) || */
+                /* vcpu_try_resume(ginfo, vcpu_info, record, info) || */
                 vcpu_try_release(ginfo, vcpu_info, record, info) ||
                 vcpu_try_completion(ginfo, vcpu_info, record, info) ||
                 try_switch_to(ginfo, vcpu_info, record, info) ||
@@ -265,9 +268,9 @@ int rt_vcpu_plot_record_matches(struct rt_plot_common *rt,
         match = rt_graph_check_server_switch_to(ARG, &dint, &dint, &dull)   ||
                 rt_graph_check_server_switch_away(ARG, &dint, &dint, &dull) ||
                 rt_graph_check_server_completion(ARG, &dint, &dull)  ||
-                rt_graph_check_server_release(ARG, &dint, &dull, &dull)     ||
-                rt_graph_check_server_block(ARG, &dull)                     ||
-                rt_graph_check_server_resume(ARG, &dull);
+                rt_graph_check_server_release(ARG, &dint, &dull, &dull);
+                /* rt_graph_check_server_block(ARG, &dull)                  || */
+                /* rt_graph_check_server_resume(ARG, &dull); */
 #undef ARG
         return (sid == vcpu_info->sid);
 }
@@ -364,55 +367,55 @@ int vcpu_try_completion(struct graph_info *ginfo,
         return ret;
 }
 
-/**
- * vcpu_try_block - start block box if record matches
- */
-int vcpu_try_block(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
-                   struct record *record, struct plot_info *info)
-{
-        int sid, match, ret = 0;
-        unsigned long long ts;
-
-        match = rt_graph_check_server_block(ginfo, record, &sid, &ts);
-        if (match && sid == vcpu_info->sid) {
-                vcpu_info->fresh = FALSE;
-                vcpu_info->block_time = ts;
-                vcpu_info->block_cpu = NO_CPU;
-                dprintf(3, "VCPU resume for %d on %d at %llu\n",
-                        sid, record->cpu, ts);
-                ret = 1;
-        }
-        return ret;
-}
-
-/**
- * vcpu_try_resume - end block box if record matches
- */
-int vcpu_try_resume(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
-                    struct record *record, struct plot_info *info)
-{
-        int sid, match, ret = 0;
-        unsigned long long ts;
-
-        match = rt_graph_check_server_resume(ginfo, record, &sid, &ts);
-
-        if (match && sid == vcpu_info->sid) {
-                info->box = TRUE;
-                info->bcolor = 0x0;
-                info->bfill = TRUE;
-                info->bthin = TRUE;
-                info->bstart = vcpu_info->block_time;
-                info->bend = ts;
-                vcpu_info->fresh = FALSE;
-
-                vcpu_info->block_time = 0ULL;
-                vcpu_info->block_cpu = NO_CPU;
-                dprintf(3, "VCPU resume for %d on %d at %llu\n",
-                        sid, record->cpu, ts);
-
-                ret = 1;
-        }
-        return ret;
-}
+/* /\** */
+/*  * vcpu_try_block - start block box if record matches */
+/*  *\/ */
+/* int vcpu_try_block(struct graph_info *ginfo, struct vcpu_info *vcpu_info, */
+/*                 struct record *record, struct plot_info *info) */
+/* { */
+/*      int sid, match, ret = 0; */
+/*      unsigned long long ts; */
+
+/*      match = rt_graph_check_server_block(ginfo, record, &sid, &ts); */
+/*      if (match && sid == vcpu_info->sid) { */
+/*              vcpu_info->fresh = FALSE; */
+/*              vcpu_info->block_time = ts; */
+/*              vcpu_info->block_cpu = NO_CPU; */
+/*              dprintf(3, "VCPU resume for %d on %d at %llu\n", */
+/*                      sid, record->cpu, ts); */
+/*              ret = 1; */
+/*      } */
+/*      return ret; */
+/* } */
+
+/* /\** */
+/*  * vcpu_try_resume - end block box if record matches */
+/*  *\/ */
+/* int vcpu_try_resume(struct graph_info *ginfo, struct vcpu_info *vcpu_info, */
+/*                  struct record *record, struct plot_info *info) */
+/* { */
+/*      int sid, match, ret = 0; */
+/*      unsigned long long ts; */
+
+/*      match = rt_graph_check_server_resume(ginfo, record, &sid, &ts); */
+
+/*      if (match && sid == vcpu_info->sid) { */
+/*              info->box = TRUE; */
+/*              info->bcolor = 0x0; */
+/*              info->bfill = TRUE; */
+/*              info->bthin = TRUE; */
+/*              info->bstart = vcpu_info->block_time; */
+/*              info->bend = ts; */
+/*              vcpu_info->fresh = FALSE; */
+
+/*              vcpu_info->block_time = 0ULL; */
+/*              vcpu_info->block_cpu = NO_CPU; */
+/*              dprintf(3, "VCPU resume for %d on %d at %llu\n", */
+/*                      sid, record->cpu, ts); */
+
+/*              ret = 1; */
+/*      } */
+/*      return ret; */
+/* } */
 
 
diff --git a/rt-plot-vtask.c b/rt-plot-vtask.c
index 5b54343..5000873 100644
--- a/rt-plot-vtask.c
+++ b/rt-plot-vtask.c
@@ -119,6 +119,9 @@ static void do_plot_end(struct graph_info *ginfo, struct vcpu_info *vcpu_info,
         unsigned long long deadline, release;
         struct record *record;
 
+        if (ginfo->view_end_time == ginfo->end_time)
+                return;
+
         if (vcpu_info->run_time && vcpu_info->run_cpu != NO_CPU) {
                 info->box = TRUE;
                 info->bcolor = hash_pid(vcpu_info->sid);
@@ -158,8 +161,8 @@ static int rt_vtask_plot_event(struct graph_info *ginfo, struct graph_plot *plot
 
         match = try_server_switch_away(ginfo, vcpu_info, record, info) ||
                 try_server_switch_to(ginfo, vcpu_info, record, info) ||
-                vcpu_try_block(ginfo, vcpu_info, record, info) ||
-                vcpu_try_resume(ginfo, vcpu_info, record, info) ||
+                /* vcpu_try_block(ginfo, vcpu_info, record, info) || */
+                /* vcpu_try_resume(ginfo, vcpu_info, record, info) || */
                 vcpu_try_release(ginfo, vcpu_info, record, info) ||
                 vcpu_try_completion(ginfo, vcpu_info, record, info) ||
                 try_switch_to(ginfo, vcpu_info, record, info) ||
diff --git a/trace-graph.c b/trace-graph.c
index d8367ae..b20aabe 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -55,7 +55,7 @@
 #define PLOT_GIVE       2
 #define PLOT_BEGIN      80
 #define PLOT_SEP        50
-#define MAX_TRI_TIME    10000000
+#define MAX_TRI_TIME    1000000
 #define PLOT_LINE(plot) (PLOT_SEP * (plot) + PLOT_BEGIN + PLOT_SIZE)
 #define PLOT_TOP(plot) (PLOT_LINE(plot) - PLOT_SIZE * 2)
 #define PLOT_BOX_TOP(plot) (PLOT_LINE(plot) - PLOT_SIZE)
@@ -1695,7 +1695,7 @@ static void draw_plot_box(struct graph_info *ginfo, int i,
                            fill,
                            x1, y,
                            x2 - x1, size);
-        if (!thin && fill && is_high_res(ginfo)) {
+        if (!thin && fill && (x2 - x1 > 1)) {
                 gdk_draw_rectangle(ginfo->curr_pixmap,
                                    ginfo->draw->style->black_gc,
                                    FALSE,
@@ -1703,8 +1703,16 @@ static void draw_plot_box(struct graph_info *ginfo, int i,
                                    x2 - x1, size);
         }
 
-        if (label)
-                draw_plot_label(ginfo, label, x1 + 1, y + 1, x2 - x1 - 2);
+        if (label) {
+                if (!thin)
+                        draw_plot_label(ginfo, label, x1 + 1,
+                                        y + 1, x2 - x1 - 2);
+                else
+                        draw_plot_label(ginfo, label, (x1 + x2) / 2,
+                                        y - PLOT_BOX_SIZE,
+                                        x2 - x1 - 2);
+        }
+
 }
 
 static void draw_plot_release(struct graph_info *ginfo, int i,
diff --git a/trace-graph.h b/trace-graph.h
index d56438d..67a8f35 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -80,6 +80,14 @@ struct plot_info {
 
         gboolean                completion;
         unsigned long long      ctime;
+
+        gboolean                ubox;
+        unsigned long long      ubtime;
+        char                    *ublabel;
+
+        gboolean                dbox;
+        unsigned long long      dbtime;
+        char                    *dblabel;
 };
 
 /*