trace-graph: Move reading sched switch comms into trace-graph.c

Move the reading of missed comms from sched_switch events from
trace-plot-cpu.c into trace-graph.c into the sched_switch check
itself.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 15 insertions, 12 deletions

diff --git a/trace-graph.c b/trace-graph.c
index 3c3f98d..00493b2 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -793,6 +793,7 @@ int trace_graph_check_sched_switch(struct graph_info *ginfo,
         unsigned long long val;
         struct event_format *event;
         gint id;
+        int ret = 1;
 
         if (ginfo->event_sched_switch_id < 0) {
                 event = pevent_find_event_by_name(ginfo->pevent,
@@ -820,7 +821,7 @@ int trace_graph_check_sched_switch(struct graph_info *ginfo,
                         *comm = record->data + ginfo->event_comm_field->offset;
                 if (pid)
                         *pid = val;
-                return 1;
+                goto out;
         }
 
         if (id == ginfo->ftrace_sched_switch_id) {
@@ -829,7 +830,19 @@ int trace_graph_check_sched_switch(struct graph_info *ginfo,
                         *comm = record->data + ginfo->ftrace_comm_field->offset;
                 if (pid)
                         *pid = val;
-                return 1;
+                goto out;
+        }
+
+        ret = 0;
+ out:
+        if (ret && comm && ginfo->read_comms) {
+                /*
+                 * First time through, register any missing
+                 *  comm / pid mappings.
+                 */
+                if (!pevent_pid_is_registered(ginfo->pevent, *pid))
+                        pevent_register_comm(ginfo->pevent,
+                                             strdup(*comm), *pid);
         }
 
         return 0;
diff --git a/trace-plot-cpu.c b/trace-plot-cpu.c
index e99fec8..50d720b 100644
--- a/trace-plot-cpu.c
+++ b/trace-plot-cpu.c
@@ -98,16 +98,6 @@ static int filter_record(struct graph_info *ginfo,
                 /* Also show the task switching out */
                 if (filter)
                         filter = trace_graph_filter_on_task(ginfo, *sched_pid);
-
-                if (ginfo->read_comms) {
-                        /*
-                         * First time through, register any missing
-                         *  comm / pid mappings.
-                         */
-                        if (!pevent_pid_is_registered(ginfo->pevent, *sched_pid))
-                                pevent_register_comm(ginfo->pevent,
-                                                     strdup(comm), *sched_pid);
-                }
         } else
                 *sched_pid = *orig_pid;