tools lib traceevent: Add builtin handler for trace_marker_raw
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Thu, 2 Jul 2020 18:53:57 +0000 (14:53 -0400)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Jul 2020 12:01:54 +0000 (09:01 -0300)
When something is written into trace_marker_raw, it goes in as a binary.
But the printk_fmt() of the event that is created (raw_data)'s format
file only prints the first byte of data:

  print fmt: "id:%04x %08x", REC->id, (int)REC->buf[0]

This is not very useful if we want to see the full data output.

Implement the processing of the raw_data event like it is in the kernel.

Link: http://lore.kernel.org/linux-trace-devel/20200702174950.123454-5-tz.stoyanov@gmail.com
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
[ Ported from trace-cmd.git ]
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lore.kernel.org/lkml/20200702185705.445969275@goodmis.org
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/plugins/plugin_function.c

index c7d321968f390ac03427b6b2b2bf557d7fbc8f2c..7e8e29b43d1cde2f89a73bb9394aa6159888f711 100644 (file)
@@ -222,6 +222,44 @@ trace_stack_handler(struct trace_seq *s, struct tep_record *record,
        return 0;
 }
 
+static int
+trace_raw_data_handler(struct trace_seq *s, struct tep_record *record,
+                   struct tep_event *event, void *context)
+{
+       struct tep_format_field *field;
+       unsigned long long id;
+       int long_size;
+       void *data = record->data;
+
+       if (tep_get_field_val(s, event, "id", record, &id, 1))
+               return trace_seq_putc(s, '!');
+
+       trace_seq_printf(s, "# %llx", id);
+
+       field = tep_find_any_field(event, "buf");
+       if (!field) {
+               trace_seq_printf(s, "<CANT FIND FIELD %s>", "buf");
+               return 0;
+       }
+
+       long_size = tep_get_long_size(event->tep);
+
+       for (data += field->offset; data < record->data + record->size;
+            data += long_size) {
+               int size = sizeof(long);
+               int left = (record->data + record->size) - data;
+               int i;
+
+               if (size > left)
+                       size = left;
+
+               for (i = 0; i < size; i++)
+                       trace_seq_printf(s, " %02x", *(unsigned char *)(data + i));
+       }
+
+       return 0;
+}
+
 int TEP_PLUGIN_LOADER(struct tep_handle *tep)
 {
        tep_register_event_handler(tep, -1, "ftrace", "function",
@@ -230,6 +268,9 @@ int TEP_PLUGIN_LOADER(struct tep_handle *tep)
        tep_register_event_handler(tep, -1, "ftrace", "kernel_stack",
                                      trace_stack_handler, NULL);
 
+       tep_register_event_handler(tep, -1, "ftrace", "raw_data",
+                                     trace_raw_data_handler, NULL);
+
        tep_plugin_add_options("ftrace", plugin_options);
 
        return 0;