3 files changed, 22 insertions, 15 deletions

diff --git a/rt-graph.c b/rt-graph.c
index 4aa06ac..8b9c360 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -157,9 +157,9 @@ int rt_graph_check_task_param(struct rt_graph_info *rtg_info,
  * Return 1 and @pid, @job, and @ts if the record matches
  */
 int rt_graph_check_switch_to(struct rt_graph_info *rtg_info,
-                                  struct pevent *pevent, struct record *record,
-                                  gint *pid, gint *job,
-                                  unsigned long long *ts)
+                             struct pevent *pevent, struct record *record,
+                             gint *pid, gint *job,
+                             unsigned long long *ts)
 {
         struct event_format *event;
         unsigned long long val;
diff --git a/rt-plot-cpu.c b/rt-plot-cpu.c
index 25c4ec9..4c98a95 100644
--- a/rt-plot-cpu.c
+++ b/rt-plot-cpu.c
@@ -78,11 +78,6 @@ __find_record(struct graph_info *ginfo, int cpu, unsigned long long time,
 
                 if (display)
                         ignored = !is_displayed(ginfo, eid);
-                else
-                        /* Without this ignore, the info popup is going
-                         * to be sched_switchs almost always.
-                         */
-                        ignored = (eid == ginfo->event_sched_switch_id);
 
                 if (get_rts(ginfo, record) >= time && !ignored)
                         break;
@@ -138,13 +133,14 @@ static int get_time_info(struct graph_info *ginfo,
         struct record *record;
         struct rt_graph_info *rtg_info = &ginfo->rtg_info;
         unsigned long long dull, max_ts;
+        const char *comm;
         int cpu, is_running, pid, job;
 
         cpu = rtc_info->cpu;
         *out_pid = *out_job = is_running = 0;
 
+        *out_record = find_display_record(ginfo, cpu, time);
         record = find_record(ginfo, cpu, time);
-        *out_record = record;
         if (!record)
                 goto out;
 
@@ -154,14 +150,22 @@ static int get_time_info(struct graph_info *ginfo,
                         break;
 
 #define ARG rtg_info, ginfo->pevent, record, &pid, &job, &dull
-                if (rt_graph_check_switch_to(ARG)) {
-                        /* Nothing is running */
+                if (rt_graph_check_switch_to(ARG) && pid) {
                         goto out;
-                } else if (rt_graph_check_switch_away(ARG)) {
+                } else if (rt_graph_check_switch_away(ARG) && pid) {
                         is_running = 1;
                         *out_pid = pid;
                         *out_job = job;
                         goto out;
+                } else if (trace_graph_check_sched_switch(ginfo, record,
+                                                          &pid, &comm)) {
+                        pid = pevent_data_pid(ginfo->pevent, record);
+                        if (pid) {
+                                *out_pid = pid;
+                                *out_job = 0;
+                                is_running = 1;
+                                goto out;
+                        }
                 }
                 if (*out_record != record)
                         free_record(record);
@@ -182,6 +186,7 @@ try_switch_away(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
 
         match = rt_graph_check_switch_away(&ginfo->rtg_info, ginfo->pevent,
                                            record, &pid, &job, &ts);
+        match = match && pid;
         if (match) {
                 update_pid(rtc_info, pid);
                 if (rtc_info->rt_run_time && rtc_info->rt_run_time < ts &&
@@ -209,6 +214,8 @@ try_switch_to(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
 
         match = rt_graph_check_switch_to(&ginfo->rtg_info, ginfo->pevent,
                                          record, &pid, &job, &ts);
+        match = match && pid;
+
         if (match) {
                 update_pid(rtc_info, pid);
                 rtc_info->rt_run_time = ts;
@@ -246,7 +253,8 @@ try_sched_switch(struct graph_info *ginfo, struct rt_cpu_info *rtc_info,
                 /* Only draw if no real-time task is running */
                 if (!rtc_info->rt_run_time) {
                         if (rtc_info->reg_run_time &&
-                            rtc_info->reg_run_time < get_rts(ginfo, record)) {
+                            rtc_info->reg_run_time < get_rts(ginfo, record) &&
+                            from_pid) {
                                 /* A non-rt task was running */
                                 info->box = TRUE;
                                 info->bthin = TRUE;
diff --git a/trace-graph.c b/trace-graph.c
index 76420d6..226c893 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1644,7 +1644,6 @@ static gint draw_plot_line(struct graph_info *ginfo, int i,
         gint y;
 
         x = convert_time_to_x(ginfo, time);
-        /* y = (small) ? PLOT_BOX_TOP(i) : PLOT_TOP(i); */
         y = PLOT_TOP(i);
 
         if (!small || is_high_res(ginfo)) {
@@ -1696,7 +1695,7 @@ static void draw_plot_box(struct graph_info *ginfo, int i,
                            fill,
                            x1, y,
                            x2 - x1, size);
-        if (is_high_res(ginfo)) {
+        if (!thin && is_high_res(ginfo)) {
                 gdk_draw_rectangle(ginfo->curr_pixmap,
                                    ginfo->draw->style->black_gc,
                                    FALSE,