Commit d3542436 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Add alias field to struct format_field

Introduce an 'alias' field to 'struct format_field' to be able
to use alternative name for the field.

It is initialized with same string pointer as 'name' field.
The free logic checks the 'alias' pointer being reset by user
and frees it.

This will be handy when converting data into CTF, where each
field within event needs to have a unique name (while this
is not required for tracepoint). Converter can easily assign
unique name into the format_field struct.
Suggested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jeremie Galarneau <jgalar@efficios.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-qwyq8blnfkg6s5vlbrvn1en3@git.kernel.org
Link: http://lkml.kernel.org/r/1429372220-6406-6-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c2141055
...@@ -1387,7 +1387,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f ...@@ -1387,7 +1387,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
do_warning_event(event, "%s: no type found", __func__); do_warning_event(event, "%s: no type found", __func__);
goto fail; goto fail;
} }
field->name = last_token; field->name = field->alias = last_token;
if (test_type(type, EVENT_OP)) if (test_type(type, EVENT_OP))
goto fail; goto fail;
...@@ -1469,7 +1469,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f ...@@ -1469,7 +1469,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
size_dynamic = type_size(field->name); size_dynamic = type_size(field->name);
free_token(field->name); free_token(field->name);
strcat(field->type, brackets); strcat(field->type, brackets);
field->name = token; field->name = field->alias = token;
type = read_token(&token); type = read_token(&token);
} else { } else {
char *new_type; char *new_type;
...@@ -6444,6 +6444,8 @@ void pevent_ref(struct pevent *pevent) ...@@ -6444,6 +6444,8 @@ void pevent_ref(struct pevent *pevent)
void pevent_free_format_field(struct format_field *field) void pevent_free_format_field(struct format_field *field)
{ {
free(field->type); free(field->type);
if (field->alias != field->name)
free(field->alias);
free(field->name); free(field->name);
free(field); free(field);
} }
......
...@@ -191,6 +191,7 @@ struct format_field { ...@@ -191,6 +191,7 @@ struct format_field {
struct event_format *event; struct event_format *event;
char *type; char *type;
char *name; char *name;
char *alias;
int offset; int offset;
int size; int size;
unsigned int arraylen; unsigned int arraylen;
......
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