mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
tools lib traceevent: Add support for __print_array()
Since 6ea22486ba
("tracing: Add array printing helper") trace can
generate traces with variable element size arrays. Add support to
parse them.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1427195239-15730-1-git-send-email-javi.merino@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
e1644aae45
commit
b839e1e846
4 changed files with 111 additions and 0 deletions
|
@ -766,6 +766,11 @@ static void free_arg(struct print_arg *arg)
|
||||||
free_arg(arg->hex.field);
|
free_arg(arg->hex.field);
|
||||||
free_arg(arg->hex.size);
|
free_arg(arg->hex.size);
|
||||||
break;
|
break;
|
||||||
|
case PRINT_INT_ARRAY:
|
||||||
|
free_arg(arg->int_array.field);
|
||||||
|
free_arg(arg->int_array.count);
|
||||||
|
free_arg(arg->int_array.el_size);
|
||||||
|
break;
|
||||||
case PRINT_TYPE:
|
case PRINT_TYPE:
|
||||||
free(arg->typecast.type);
|
free(arg->typecast.type);
|
||||||
free_arg(arg->typecast.item);
|
free_arg(arg->typecast.item);
|
||||||
|
@ -2544,6 +2549,32 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
|
||||||
return EVENT_ERROR;
|
return EVENT_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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_delim(event, ",", &arg->int_array.field))
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
if (alloc_and_process_delim(event, ",", &arg->int_array.count))
|
||||||
|
goto free_field;
|
||||||
|
|
||||||
|
if (alloc_and_process_delim(event, ")", &arg->int_array.el_size))
|
||||||
|
goto free_size;
|
||||||
|
|
||||||
|
return read_token_item(tok);
|
||||||
|
|
||||||
|
free_size:
|
||||||
|
free_arg(arg->int_array.count);
|
||||||
|
free_field:
|
||||||
|
free_arg(arg->int_array.field);
|
||||||
|
out:
|
||||||
|
*tok = NULL;
|
||||||
|
return EVENT_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
static enum event_type
|
static enum event_type
|
||||||
process_dynamic_array(struct event_format *event, struct print_arg *arg, char **tok)
|
process_dynamic_array(struct event_format *event, struct print_arg *arg, char **tok)
|
||||||
{
|
{
|
||||||
|
@ -2839,6 +2870,10 @@ process_function(struct event_format *event, struct print_arg *arg,
|
||||||
free_token(token);
|
free_token(token);
|
||||||
return process_hex(event, arg, tok);
|
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) {
|
if (strcmp(token, "__get_str") == 0) {
|
||||||
free_token(token);
|
free_token(token);
|
||||||
return process_str(event, arg, tok);
|
return process_str(event, arg, tok);
|
||||||
|
@ -3367,6 +3402,7 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg
|
||||||
break;
|
break;
|
||||||
case PRINT_FLAGS:
|
case PRINT_FLAGS:
|
||||||
case PRINT_SYMBOL:
|
case PRINT_SYMBOL:
|
||||||
|
case PRINT_INT_ARRAY:
|
||||||
case PRINT_HEX:
|
case PRINT_HEX:
|
||||||
break;
|
break;
|
||||||
case PRINT_TYPE:
|
case PRINT_TYPE:
|
||||||
|
@ -3777,6 +3813,54 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case PRINT_INT_ARRAY: {
|
||||||
|
void *num;
|
||||||
|
int el_size;
|
||||||
|
|
||||||
|
if (arg->int_array.field->type == PRINT_DYNAMIC_ARRAY) {
|
||||||
|
unsigned long offset;
|
||||||
|
struct format_field *field =
|
||||||
|
arg->int_array.field->dynarray.field;
|
||||||
|
offset = pevent_read_number(pevent,
|
||||||
|
data + field->offset,
|
||||||
|
field->size);
|
||||||
|
num = data + (offset & 0xffff);
|
||||||
|
} 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.count);
|
||||||
|
el_size = eval_num_arg(data, size, event,
|
||||||
|
arg->int_array.el_size);
|
||||||
|
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, "%lu", *(uint64_t *)num);
|
||||||
|
} else {
|
||||||
|
trace_seq_printf(s, "BAD SIZE:%d 0x%x",
|
||||||
|
el_size, *(uint8_t *)num);
|
||||||
|
el_size = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
num += el_size;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case PRINT_TYPE:
|
case PRINT_TYPE:
|
||||||
break;
|
break;
|
||||||
case PRINT_STRING: {
|
case PRINT_STRING: {
|
||||||
|
@ -5361,6 +5445,15 @@ static void print_args(struct print_arg *args)
|
||||||
print_args(args->hex.size);
|
print_args(args->hex.size);
|
||||||
printf(")");
|
printf(")");
|
||||||
break;
|
break;
|
||||||
|
case PRINT_INT_ARRAY:
|
||||||
|
printf("__print_array(");
|
||||||
|
print_args(args->int_array.field);
|
||||||
|
printf(", ");
|
||||||
|
print_args(args->int_array.count);
|
||||||
|
printf(", ");
|
||||||
|
print_args(args->int_array.el_size);
|
||||||
|
printf(")");
|
||||||
|
break;
|
||||||
case PRINT_STRING:
|
case PRINT_STRING:
|
||||||
case PRINT_BSTRING:
|
case PRINT_BSTRING:
|
||||||
printf("__get_str(%s)", args->string.string);
|
printf("__get_str(%s)", args->string.string);
|
||||||
|
|
|
@ -251,6 +251,12 @@ struct print_arg_hex {
|
||||||
struct print_arg *size;
|
struct print_arg *size;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct print_arg_int_array {
|
||||||
|
struct print_arg *field;
|
||||||
|
struct print_arg *count;
|
||||||
|
struct print_arg *el_size;
|
||||||
|
};
|
||||||
|
|
||||||
struct print_arg_dynarray {
|
struct print_arg_dynarray {
|
||||||
struct format_field *field;
|
struct format_field *field;
|
||||||
struct print_arg *index;
|
struct print_arg *index;
|
||||||
|
@ -279,6 +285,7 @@ enum print_arg_type {
|
||||||
PRINT_FLAGS,
|
PRINT_FLAGS,
|
||||||
PRINT_SYMBOL,
|
PRINT_SYMBOL,
|
||||||
PRINT_HEX,
|
PRINT_HEX,
|
||||||
|
PRINT_INT_ARRAY,
|
||||||
PRINT_TYPE,
|
PRINT_TYPE,
|
||||||
PRINT_STRING,
|
PRINT_STRING,
|
||||||
PRINT_BSTRING,
|
PRINT_BSTRING,
|
||||||
|
@ -298,6 +305,7 @@ struct print_arg {
|
||||||
struct print_arg_flags flags;
|
struct print_arg_flags flags;
|
||||||
struct print_arg_symbol symbol;
|
struct print_arg_symbol symbol;
|
||||||
struct print_arg_hex hex;
|
struct print_arg_hex hex;
|
||||||
|
struct print_arg_int_array int_array;
|
||||||
struct print_arg_func func;
|
struct print_arg_func func;
|
||||||
struct print_arg_string string;
|
struct print_arg_string string;
|
||||||
struct print_arg_bitmask bitmask;
|
struct print_arg_bitmask bitmask;
|
||||||
|
|
|
@ -214,6 +214,11 @@ static void define_event_symbols(struct event_format *event,
|
||||||
define_event_symbols(event, ev_name, args->hex.field);
|
define_event_symbols(event, ev_name, args->hex.field);
|
||||||
define_event_symbols(event, ev_name, args->hex.size);
|
define_event_symbols(event, ev_name, args->hex.size);
|
||||||
break;
|
break;
|
||||||
|
case PRINT_INT_ARRAY:
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.field);
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.count);
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.el_size);
|
||||||
|
break;
|
||||||
case PRINT_BSTRING:
|
case PRINT_BSTRING:
|
||||||
case PRINT_DYNAMIC_ARRAY:
|
case PRINT_DYNAMIC_ARRAY:
|
||||||
case PRINT_STRING:
|
case PRINT_STRING:
|
||||||
|
|
|
@ -231,6 +231,11 @@ static void define_event_symbols(struct event_format *event,
|
||||||
define_event_symbols(event, ev_name, args->hex.field);
|
define_event_symbols(event, ev_name, args->hex.field);
|
||||||
define_event_symbols(event, ev_name, args->hex.size);
|
define_event_symbols(event, ev_name, args->hex.size);
|
||||||
break;
|
break;
|
||||||
|
case PRINT_INT_ARRAY:
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.field);
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.count);
|
||||||
|
define_event_symbols(event, ev_name, args->int_array.el_size);
|
||||||
|
break;
|
||||||
case PRINT_STRING:
|
case PRINT_STRING:
|
||||||
break;
|
break;
|
||||||
case PRINT_TYPE:
|
case PRINT_TYPE:
|
||||||
|
|
Loading…
Reference in a new issue