Commit 7d27adf5 authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt (VMware)

tracing: Don't show dynamic string internals in synthetic event description

For synthetic event dynamic fields, the type contains "__data_loc",
which is basically an internal part of the type which is only meant to
be displayed in the format, not in the event description itself, which
is confusing to users since they can't use __data_loc on the
command-line to define an event field, which printing it would lead
them to believe.

So filter it out from the description, while leaving it in the type.

Link: https://lkml.kernel.org/r/b3b7baf7813298a5ede4ff02e2e837b91c05a724.1602598160.git.zanussi@kernel.orgReported-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Tested-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarTom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 499f7bb0
...@@ -1867,14 +1867,22 @@ static int __synth_event_show(struct seq_file *m, struct synth_event *event) ...@@ -1867,14 +1867,22 @@ static int __synth_event_show(struct seq_file *m, struct synth_event *event)
{ {
struct synth_field *field; struct synth_field *field;
unsigned int i; unsigned int i;
char *type, *t;
seq_printf(m, "%s\t", event->name); seq_printf(m, "%s\t", event->name);
for (i = 0; i < event->n_fields; i++) { for (i = 0; i < event->n_fields; i++) {
field = event->fields[i]; field = event->fields[i];
type = field->type;
t = strstr(type, "__data_loc");
if (t) { /* __data_loc belongs in format but not event desc */
t += sizeof("__data_loc");
type = t;
}
/* parameter values */ /* parameter values */
seq_printf(m, "%s %s%s", field->type, field->name, seq_printf(m, "%s %s%s", type, field->name,
i == event->n_fields - 1 ? "" : "; "); i == event->n_fields - 1 ? "" : "; ");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment