[PATCH v3 3/3] tools lib traceevent: Add support for __print_array()
Trace can now generate traces with variable element size arrays. Add support
to parse them.
Cc: Namhyung Kim
Cc: Arnaldo Carvalho de Melo
Cc: Steven Rostedt
Cc: Jiri Olsa
Signed-off-by: Javi Merino
---
Changes since v2[0]:
- Avoid repeating the alloc and process of fields in prcoess_int_array()
- print a warning if the size of the array is not valid
[0] http://thread.gmane.org/gmane.linux.kernel/1867165/focus=1867166
tools/lib/traceevent/event-parse.c | 91 ++
tools/lib/traceevent/event-parse.h | 8
2 files changed, 99 insertions(+)
diff --git a/tools/lib/traceevent/event-parse.c
b/tools/lib/traceevent/event-parse.c
index 9d063b829907..8626c57cd769 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -757,6 +757,11 @@ static void free_arg(struct print_arg *arg)
free_arg(arg->hex.field);
free_arg(arg->hex.size);
break;
+ case PRINT_INT_ARRAY:
+ free_arg(arg->int_array.field);
+ free_arg(arg->int_array.size);
+ free_arg(arg->int_array.el_size);
+ break;
case PRINT_TYPE:
free(arg->typecast.type);
free_arg(arg->typecast.item);
@@ -2536,6 +2541,32 @@ out:
}
static enum event_type
+process_int_array(struct event_format *event, struct print_arg *arg, char
**tok)
+{
+ memset(arg, 0, sizeof(*arg));
+ arg->type = PRINT_INT_ARRAY;
+
+ if (alloc_and_process_arg(event, ",", >int_array.field))
+ goto out;
+
+ if (alloc_and_process_arg(event, ",", >int_array.size))
+ goto free_field;
+
+ if (alloc_and_process_arg(event, ")", >int_array.el_size))
+ goto free_size;
+
+ return read_token_item(tok);
+
+free_size:
+free_arg(arg->int_array.size);
+free_field:
+ free_arg(arg->int_array.field);
+out:
+ *tok = NULL;
+ return EVENT_ERROR;
+}
+
+static enum event_type
process_dynamic_array(struct event_format *event, struct print_arg *arg, char
**tok)
{
struct format_field *field;
@@ -2830,6 +2861,10 @@ process_function(struct event_format *event, struct
print_arg *arg,
free_token(token);
return process_hex(event, arg, tok);
}
+ if (strcmp(token, "__print_array") == 0) {
+ free_token(token);
+ return process_int_array(event, arg, tok);
+ }
if (strcmp(token, "__get_str") == 0) {
free_token(token);
return process_str(event, arg, tok);
@@ -3358,6 +3393,7 @@ eval_num_arg(void *data, int size, struct event_format
*event, struct print_arg
break;
case PRINT_FLAGS:
case PRINT_SYMBOL:
+ case PRINT_INT_ARRAY:
case PRINT_HEX:
break;
case PRINT_TYPE:
@@ -3768,6 +3804,52 @@ static void print_str_arg(struct trace_seq *s, void
*data, int size,
}
break;
+ case PRINT_INT_ARRAY: {
+ void *num;
+ int el_size;
+
+ if (arg->int_array.field->type == PRINT_DYNAMIC_ARRAY) {
+ unsigned long offset;
+ offset = pevent_read_number(pevent,
+ data +
arg->int_array.field->dynarray.field->offset,
+ arg->int_array.field->dynarray.field->size);
+ num = data + (offset & 0x);
+ } else {
+ field = arg->int_array.field->field.field;
+ if (!field) {
+ str = arg->int_array.field->field.name;
+ field = pevent_find_any_field(event, str);
+ if (!field)
+ goto out_warning_field;
+ arg->int_array.field->field.field = field;
+ }
+ num = data + field->offset;
+ }
+ len = eval_num_arg(data, size, event, arg->int_array.size);
+ el_size = eval_num_arg(data, size, event,
arg->int_array.el_size);
+ el_size /= 8;
+ for (i = 0; i < len; i++) {
+ if (i)
+ trace_seq_putc(s, ' ');
+
+ if (el_size == 1) {
+ trace_seq_printf(s, "%u", *(uint8_t *)num);
+ } else if (el_size == 2) {
+ trace_seq_printf(s, "%u", *(uint16_t *)num);
+ } else if (el_size == 4) {
+ trace_seq_printf(s, "%u", *(uint32_t *)num);
+ } else if (el_size == 8) {
+ trace_seq_printf(s, "%llu", *(uint64_t *)num);
+ } else {
+
[PATCH v3 3/3] tools lib traceevent: Add support for __print_array()
Trace can now generate traces with variable element size arrays. Add support
to parse them.
Cc: Namhyung Kim namhy...@kernel.org
Cc: Arnaldo Carvalho de Melo a...@redhat.com
Cc: Steven Rostedt srost...@redhat.com
Cc: Jiri Olsa jo...@redhat.com
Signed-off-by: Javi Merino javi.mer...@arm.com
---
Changes since v2[0]:
- Avoid repeating the alloc and process of fields in prcoess_int_array()
- print a warning if the size of the array is not valid
[0] http://thread.gmane.org/gmane.linux.kernel/1867165/focus=1867166
tools/lib/traceevent/event-parse.c | 91 ++
tools/lib/traceevent/event-parse.h | 8
2 files changed, 99 insertions(+)
diff --git a/tools/lib/traceevent/event-parse.c
b/tools/lib/traceevent/event-parse.c
index 9d063b829907..8626c57cd769 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -757,6 +757,11 @@ static void free_arg(struct print_arg *arg)
free_arg(arg-hex.field);
free_arg(arg-hex.size);
break;
+ case PRINT_INT_ARRAY:
+ free_arg(arg-int_array.field);
+ free_arg(arg-int_array.size);
+ free_arg(arg-int_array.el_size);
+ break;
case PRINT_TYPE:
free(arg-typecast.type);
free_arg(arg-typecast.item);
@@ -2536,6 +2541,32 @@ out:
}
static enum event_type
+process_int_array(struct event_format *event, struct print_arg *arg, char
**tok)
+{
+ memset(arg, 0, sizeof(*arg));
+ arg-type = PRINT_INT_ARRAY;
+
+ if (alloc_and_process_arg(event, ,, arg-int_array.field))
+ goto out;
+
+ if (alloc_and_process_arg(event, ,, arg-int_array.size))
+ goto free_field;
+
+ if (alloc_and_process_arg(event, ), arg-int_array.el_size))
+ goto free_size;
+
+ return read_token_item(tok);
+
+free_size:
+free_arg(arg-int_array.size);
+free_field:
+ free_arg(arg-int_array.field);
+out:
+ *tok = NULL;
+ return EVENT_ERROR;
+}
+
+static enum event_type
process_dynamic_array(struct event_format *event, struct print_arg *arg, char
**tok)
{
struct format_field *field;
@@ -2830,6 +2861,10 @@ process_function(struct event_format *event, struct
print_arg *arg,
free_token(token);
return process_hex(event, arg, tok);
}
+ if (strcmp(token, __print_array) == 0) {
+ free_token(token);
+ return process_int_array(event, arg, tok);
+ }
if (strcmp(token, __get_str) == 0) {
free_token(token);
return process_str(event, arg, tok);
@@ -3358,6 +3393,7 @@ eval_num_arg(void *data, int size, struct event_format
*event, struct print_arg
break;
case PRINT_FLAGS:
case PRINT_SYMBOL:
+ case PRINT_INT_ARRAY:
case PRINT_HEX:
break;
case PRINT_TYPE:
@@ -3768,6 +3804,52 @@ static void print_str_arg(struct trace_seq *s, void
*data, int size,
}
break;
+ case PRINT_INT_ARRAY: {
+ void *num;
+ int el_size;
+
+ if (arg-int_array.field-type == PRINT_DYNAMIC_ARRAY) {
+ unsigned long offset;
+ offset = pevent_read_number(pevent,
+ data +
arg-int_array.field-dynarray.field-offset,
+ arg-int_array.field-dynarray.field-size);
+ num = data + (offset 0x);
+ } else {
+ field = arg-int_array.field-field.field;
+ if (!field) {
+ str = arg-int_array.field-field.name;
+ field = pevent_find_any_field(event, str);
+ if (!field)
+ goto out_warning_field;
+ arg-int_array.field-field.field = field;
+ }
+ num = data + field-offset;
+ }
+ len = eval_num_arg(data, size, event, arg-int_array.size);
+ el_size = eval_num_arg(data, size, event,
arg-int_array.el_size);
+ el_size /= 8;
+ for (i = 0; i len; i++) {
+ if (i)
+ trace_seq_putc(s, ' ');
+
+ if (el_size == 1) {
+ trace_seq_printf(s, %u, *(uint8_t *)num);
+ } else if (el_size == 2) {
+ trace_seq_printf(s, %u, *(uint16_t *)num);
+ } else if (el_size == 4) {
+ trace_seq_printf(s, %u, *(uint32_t *)num);
+ } else if (el_size == 8) {
+ trace_seq_printf(s, %llu, *(uint64_t *)num);
+
