parse-events: Add raw format for printing events

Add print_raw field to pevent that will cause the pretty_print function to output
the entries by their raw data in the fields, and will ignore the print formats.

When set, each field will show its data.

So instead of this:

sched_switch:         task swapper:0 [140] (R) ==> trace-cmd:31807 [140]

We have:

sched_switch:         prev_comm=swapper prev_pid=0 prev_prio=140 prev_state=0 next_comm=trace-cmd next_pid=31807 next_prio=140

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

2 files changed, 12 insertions, 13 deletions

diff --git a/parse-events.c b/parse-events.c
index 6c3a7ab..c1415db 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3737,11 +3737,16 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,
 {
         int print_pretty = 1;
 
-        if (event->handler)
-                print_pretty = event->handler(s, record, event);
+        if (event->pevent->print_raw)
+                print_event_fields(s, record->data, record->size, event);
+        else {
 
-        if (print_pretty)
-                pretty_print(s, record->data, record->size, event);
+                if (event->handler)
+                        print_pretty = event->handler(s, record, event);
+
+                if (print_pretty)
+                        pretty_print(s, record->data, record->size, event);
+        }
 
         trace_seq_terminate(s);
 }
@@ -3755,8 +3760,6 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         unsigned long usecs;
         const char *comm;
         void *data = record->data;
-        int size = record->size;
-        int print_pretty = 1;
         int type;
         int pid;
         int len;
@@ -3789,14 +3792,8 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         len = strlen(event->name);
         if (len < 20)
                 trace_seq_printf(s, "%.*s", 20 - len, spaces);
-        
-        if (event->handler)
-                print_pretty = event->handler(s, record, event);
-
-        if (print_pretty)
-                pretty_print(s, data, size, event);
 
-        trace_seq_terminate(s);
+        pevent_event_info(s, event, record);
 }
 
 static int events_id_cmp(const void *a, const void *b)
diff --git a/parse-events.h b/parse-events.h
index 33a5b70..ba4ef73 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -326,6 +326,8 @@ struct pevent {
         int ld_offset;
         int ld_size;
 
+        int print_raw;
+
         struct format_field *bprint_ip_field;
         struct format_field *bprint_fmt_field;
         struct format_field *bprint_buf_field;