trace-cmd: Change sched switch/wakeup plugin output

The current format for sched_switch and sched_wakeup events is:

       trace-cmd-2271  [003]  6201.438152: sched_switch:         2271:120:S ==> 0:120: kworker/0:1
          <idle>-0     [002]  6201.438301: sched_wakeup:         0:?:? +   2270:120:? trace-cmd [002] Success
          <idle>-0     [002]  6201.438311: sched_switch:         0:120:R ==> 2270:120: trace-cmd
       trace-cmd-2270  [002]  6201.438393: sched_switch:         2270:120:S ==> 0:120: kworker/0:1
          <idle>-0     [000]  6201.438799: sched_wakeup:         0:?:? +   10:120:? kworker/0:1 [000] Success
          <idle>-0     [000]  6201.438839: sched_switch:         0:120:R ==> 10:120: kworker/0:1

Which kinda sucks. Rewrite it to look like.

       trace-cmd-2271  [003]  6201.438152: sched_switch:         trace-cmd:2271 [120] S ==> kworker/0:1:0 [120]
          <idle>-0     [002]  6201.438301: sched_wakeup:         trace-cmd:2270 [120] success=1 CPU:002
          <idle>-0     [002]  6201.438311: sched_switch:         kworker/0:1:0 [120] R ==> trace-cmd:2270 [120]
       trace-cmd-2270  [002]  6201.438393: sched_switch:         trace-cmd:2270 [120] S ==> kworker/0:1:0 [120]
          <idle>-0     [000]  6201.438799: sched_wakeup:         kworker/0:1:10 [120] success=1 CPU:000
          <idle>-0     [000]  6201.438839: sched_switch:         swapper:0 [120] R ==> kworker/0:1:10 [120]

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

1 files changed, 47 insertions, 62 deletions

diff --git a/plugin_sched_switch.c b/plugin_sched_switch.c
index 7490e16..3872595 100644
--- a/plugin_sched_switch.c
+++ b/plugin_sched_switch.c
@@ -45,59 +45,50 @@ static void write_state(struct trace_seq *s, int val)
                 trace_seq_putc(s, 'R');
 }
 
-static int sched_wakeup_handler(struct trace_seq *s, struct record *record,
-                                struct event_format *event, void *context)
+static void write_and_save_comm(struct format_field *field,
+                                struct record *record,
+                                struct trace_seq *s, int pid)
 {
-        struct format_field *field;
-        unsigned long long val;
+        const char *comm;
+        int len;
 
-        if (pevent_get_common_field_val(s, event, "common_pid", record, &val, 1))
-                return trace_seq_putc(s, '!');
+        comm = (char *)(record->data + field->offset);
+        len = s->len;
+        trace_seq_printf(s, "%.*s",
+                         field->size, comm);
 
-        trace_seq_printf(s, "%lld:", val);
+        /* make sure the comm has a \0 at the end. */
+        trace_seq_terminate(s);
+        comm = &s->buffer[len];
 
-        if (pevent_get_field_val(s, event, "prev_prio", record, &val, 0))
-                trace_seq_puts(s, "?:");
-        else
-                trace_seq_printf(s, "%lld:", val);
-
-        if (pevent_get_field_val(s, event, "prev_state", record, &val, 0))
-                trace_seq_putc(s, '?');
-        else
-                write_state(s, val);
+        /* Help out the comm to ids. This will handle dups */
+        pevent_register_comm(field->event->pevent, comm, pid);
+}
 
-        trace_seq_puts(s, " +   ");
+static int sched_wakeup_handler(struct trace_seq *s, struct record *record,
+                                struct event_format *event, void *context)
+{
+        struct format_field *field;
+        unsigned long long val;
 
         if (pevent_get_field_val(s, event, "pid", record, &val, 1))
                 return trace_seq_putc(s, '!');
 
-        trace_seq_printf(s, "%lld:", val);
-
-        if (pevent_get_field_val(s, event, "prio", record, &val, 1))
-                return trace_seq_putc(s, '!');
-
-        trace_seq_printf(s, "%lld:", val);
-
-        if (pevent_get_field_val(s, event, "state", record, &val, 0))
-                trace_seq_putc(s, '?');
-        else
-                write_state(s, val);
-
-        trace_seq_putc(s, ' ');
-
-        field = pevent_find_field(event, "comm");
-        if (!field) {
-                trace_seq_printf(s, "<CANT FIND FIELD %s>", "next_comm");
-                return trace_seq_putc(s, '!');
+        field = pevent_find_any_field(event, "comm");
+        if (field) {
+                write_and_save_comm(field, record, s, val);
+                trace_seq_putc(s, ':');
         }
+        trace_seq_printf(s, "%lld", val);
 
-        trace_seq_printf(s, "%.*s", field->size, (char *)(record->data + field->offset));
+        if (pevent_get_field_val(s, event, "prio", record, &val, 0) == 0)
+                trace_seq_printf(s, " [%lld]", val);
 
-        if (pevent_get_field_val(s, event, "target_cpu", record, &val, 0) == 0)
-                trace_seq_printf(s, " [%03llu]", val);
+        if (pevent_get_field_val(s, event, "success", record, &val, 1) == 0)
+                trace_seq_printf(s, " success=%lld", val);
 
-        if (pevent_get_field_val(s, event, "success", record, &val, 0) == 0)
-                trace_seq_puts(s, val ? " Success" : " Failed");
+        if (pevent_get_field_val(s, event, "target_cpu", record, &val, 0) == 0)
+                trace_seq_printf(s, " CPU:%03llu", val);
 
         return 0;
 }
@@ -111,39 +102,33 @@ static int sched_switch_handler(struct trace_seq *s, struct record *record,
         if (pevent_get_field_val(s, event, "prev_pid", record, &val, 1))
                 return trace_seq_putc(s, '!');
 
-        trace_seq_printf(s, "%lld:", val);
-
-        if (pevent_get_field_val(s, event, "prev_prio", record, &val, 1))
-                return trace_seq_putc(s, '!');
+        field = pevent_find_any_field(event, "prev_comm");
+        if (field) {
+                write_and_save_comm(field, record, s, val);
+                trace_seq_putc(s, ':');
+        }
+        trace_seq_printf(s, "%lld ", val);
 
-        trace_seq_printf(s, "%lld:", val);
+        if (pevent_get_field_val(s, event, "prev_prio", record, &val, 0) == 0)
+                trace_seq_printf(s, "[%lld] ", val);
 
-        if (pevent_get_field_val(s,  event, "prev_state", record, &val, 1))
-                return trace_seq_putc(s, '!');
-
-        write_state(s, val);
+        if (pevent_get_field_val(s,  event, "prev_state", record, &val, 0) == 0)
+                write_state(s, val);
 
         trace_seq_puts(s, " ==> ");
 
         if (pevent_get_field_val(s, event, "next_pid", record, &val, 1))
                 return trace_seq_putc(s, '!');
 
-        trace_seq_printf(s, "%lld:", val);
-
-        if (pevent_get_field_val(s, event, "next_prio", record, &val, 1))
-                return trace_seq_putc(s, '!');
-
-        trace_seq_printf(s, "%lld:", val);
-
-        trace_seq_putc(s, ' ');
-
         field = pevent_find_any_field(event, "next_comm");
-        if (!field) {
-                trace_seq_printf(s, "<CANT FIND FIELD %s>", "next_comm");
-                return trace_seq_putc(s, '!');
+        if (field) {
+                write_and_save_comm(field, record, s, val);
+                trace_seq_putc(s, ':');
         }
+        trace_seq_printf(s, "%lld", val);
 
-        trace_seq_printf(s, "%.*s", field->size, (char *)(record->data + field->offset));
+        if (pevent_get_field_val(s, event, "next_prio", record, &val, 0) == 0)
+                trace_seq_printf(s, " [%lld]", val);
 
         return 0;
 }