parse-events: Print field contents of failed parsed event

If an event fails to parse the print string, then it is better to show the
contents as raw elements than just to print "FAILED TO PARSE" and drop the
event.

At least now the events show a bit more information, even if the print string
did not parse correctly.

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

1 files changed, 59 insertions, 2 deletions

diff --git a/parse-events.c b/parse-events.c
index ea7f5dd..6c3a7ab 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3376,6 +3376,63 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,
         trace_seq_printf(s, fmt, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
 }
 
+static void print_event_fields(struct trace_seq *s, void *data, int size,
+                               struct event_format *event)
+{
+        struct format_field *field;
+        unsigned long long val;
+        unsigned int offset, len, i;
+
+        field = event->format.fields;
+        while (field) {
+                trace_seq_printf(s, " %s=", field->name);
+                if (field->flags & FIELD_IS_ARRAY) {
+                        offset = field->offset;
+                        len = field->size;
+                        if (field->flags & FIELD_IS_DYNAMIC) {
+                                val = pevent_read_number(event->pevent, data + offset, len);
+                                offset = val;
+                                len = offset >> 16;
+                                offset &= 0xffff;
+                        }
+                        if (field->flags & FIELD_IS_STRING) {
+                                trace_seq_printf(s, "%s", (char *)data + offset);
+                        } else {
+                                trace_seq_puts(s, "ARRAY[");
+                                for (i = 0; i < len; i++) {
+                                        if (i)
+                                                trace_seq_puts(s, ", ");
+                                        trace_seq_printf(s, "%02x",
+                                                         *((unsigned char *)data + offset + i));
+                                }
+                                trace_seq_putc(s, ']');
+                        }
+                } else {
+                        val = pevent_read_number(event->pevent, data + field->offset,
+                                                 field->size);
+                        if (field->flags & FIELD_IS_POINTER) {
+                                trace_seq_printf(s, "0x%llx", val);
+                        } else if (field->flags & FIELD_IS_SIGNED) {
+                                switch (field->size) {
+                                case 4:
+                                        trace_seq_printf(s, "%d", (int)val);
+                                        break;
+                                case 2:
+                                        trace_seq_printf(s, "%2d", (short)val);
+                                        break;
+                                case 1:
+                                        trace_seq_printf(s, "%1d", (char)val);
+                                        break;
+                                default:
+                                        trace_seq_printf(s, "%lld", val);
+                                }
+                        } else
+                                trace_seq_printf(s, "%llu", val);
+                }
+                field = field->next;
+        }
+}
+
 static void pretty_print(struct trace_seq *s, void *data, int size, struct event_format *event)
 {
         struct pevent *pevent = event->pevent;
@@ -3393,8 +3450,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
         int ls;
 
         if (event->flags & EVENT_FL_FAILED) {
-                trace_seq_printf(s, "EVENT '%s' FAILED TO PARSE",
-                       event->name);
+                trace_seq_printf(s, "[FAILED TO PARSE]");
+                print_event_fields(s, data, size, event);
                 return;
         }