lkml.org 
[lkml]   [2012]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/16] tools lib traceevent: Let filtering numbers by string use function names
    Date
    From: Steven Rostedt <srostedt@redhat.com>

    As a pointer can be converted into a function name, let the filters
    work with the function name as well as with the pointer number. If
    the comparison expects a string, then convert numbers into functions,
    but only when the number is the same size as a long.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/n/tip-oxsa1qkr2eq7u8d7r0aapedu@git.kernel.org
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/lib/traceevent/parse-filter.c | 45 +++++++++++++++++++++++++++--------
    1 file changed, 35 insertions(+), 10 deletions(-)

    diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
    index dfcfe2c131de..80d872a81f26 100644
    --- a/tools/lib/traceevent/parse-filter.c
    +++ b/tools/lib/traceevent/parse-filter.c
    @@ -1710,18 +1710,43 @@ static int test_num(struct event_format *event,

    static const char *get_field_str(struct filter_arg *arg, struct pevent_record *record)
    {
    - const char *val = record->data + arg->str.field->offset;
    + struct event_format *event;
    + struct pevent *pevent;
    + unsigned long long addr;
    + const char *val = NULL;
    + char hex[64];

    - /*
    - * We need to copy the data since we can't be sure the field
    - * is null terminated.
    - */
    - if (*(val + arg->str.field->size - 1)) {
    - /* copy it */
    - memcpy(arg->str.buffer, val, arg->str.field->size);
    - /* the buffer is already NULL terminated */
    - val = arg->str.buffer;
    + /* If the field is not a string convert it */
    + if (arg->str.field->flags & FIELD_IS_STRING) {
    + val = record->data + arg->str.field->offset;
    +
    + /*
    + * We need to copy the data since we can't be sure the field
    + * is null terminated.
    + */
    + if (*(val + arg->str.field->size - 1)) {
    + /* copy it */
    + memcpy(arg->str.buffer, val, arg->str.field->size);
    + /* the buffer is already NULL terminated */
    + val = arg->str.buffer;
    + }
    +
    + } else {
    + event = arg->str.field->event;
    + pevent = event->pevent;
    + addr = get_value(event, arg->str.field, record);
    +
    + if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))
    + /* convert to a kernel symbol */
    + val = pevent_find_function(pevent, addr);
    +
    + if (val == NULL) {
    + /* just use the hex of the string name */
    + snprintf(hex, 64, "0x%llx", addr);
    + val = hex;
    + }
    }
    +
    return val;
    }

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-07-04 08:21    [W:0.024 / U:30.872 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site