lkml.org 
[lkml]   [2015]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/64] tools lib traceevent: Add alias field to struct format_field
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    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: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Acked-by: Steven 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.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/lib/traceevent/event-parse.c | 6 ++++--
    tools/lib/traceevent/event-parse.h | 1 +
    2 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
    index 12a7e2a40c89..1ec56b459bc0 100644
    --- a/tools/lib/traceevent/event-parse.c
    +++ b/tools/lib/traceevent/event-parse.c
    @@ -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__);
    goto fail;
    }
    - field->name = last_token;
    + field->name = field->alias = last_token;

    if (test_type(type, EVENT_OP))
    goto fail;
    @@ -1469,7 +1469,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
    size_dynamic = type_size(field->name);
    free_token(field->name);
    strcat(field->type, brackets);
    - field->name = token;
    + field->name = field->alias = token;
    type = read_token(&token);
    } else {
    char *new_type;
    @@ -6444,6 +6444,8 @@ void pevent_ref(struct pevent *pevent)
    void pevent_free_format_field(struct format_field *field)
    {
    free(field->type);
    + if (field->alias != field->name)
    + free(field->alias);
    free(field->name);
    free(field);
    }
    diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
    index 86a5839fb048..063b1971eb35 100644
    --- a/tools/lib/traceevent/event-parse.h
    +++ b/tools/lib/traceevent/event-parse.h
    @@ -191,6 +191,7 @@ struct format_field {
    struct event_format *event;
    char *type;
    char *name;
    + char *alias;
    int offset;
    int size;
    unsigned int arraylen;
    --
    1.9.3


    \
     
     \ /
      Last update: 2015-04-28 15:41    [W:2.204 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site