lkml.org 
[lkml]   [2011]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/25] dynamic_debug: factor vpr_info_dq out of ddebug_parse_query
    Date
    From: Jim Cromie <jim.cromie@gmail.com>

    Factor pr_info(query) out of ddebug_parse_query, into pr_info_dq(),
    for reuse later. Also change the printed labels: file, func to agree
    with the query-spec keywords accepted in the control file. Pass ""
    when string is null, to avoid "(null)" output from sprintf. For
    format print, use precision to skip last char, assuming its '\n', no
    great harm if not, its a debug msg,

    Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
    ---
    lib/dynamic_debug.c | 25 +++++++++++++++++--------
    1 files changed, 17 insertions(+), 8 deletions(-)

    diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
    index cb078d4..1a0e9bd 100644
    --- a/lib/dynamic_debug.c
    +++ b/lib/dynamic_debug.c
    @@ -107,6 +107,22 @@ static char *ddebug_describe_flags(struct _ddebug *dp, char *buf,
    return buf;
    }

    +#define vpr_info_dq(q, msg) \
    +do { \
    + if (verbose) \
    + /* trim last char off format print */ \
    + pr_info("%s: func=\"%s\" file=\"%s\" " \
    + "module=\"%s\" format=\"%.*s\" " \
    + "lineno=%u-%u", \
    + msg, \
    + q->function ? q->function : "", \
    + q->filename ? q->filename : "", \
    + q->module ? q->module : "", \
    + (int)(q->format ? strlen(q->format) - 1 : 0), \
    + q->format ? q->format : "", \
    + q->first_lineno, q->last_lineno); \
    +} while (0)
    +
    /*
    * Search the tables for _ddebug's which match the given
    * `query' and apply the `flags' and `mask' to them. Tells
    @@ -367,14 +383,7 @@ static int ddebug_parse_query(char *words[], int nwords,
    if (rc)
    return rc;
    }
    -
    - if (verbose)
    - pr_info("q->function=\"%s\" q->filename=\"%s\" "
    - "q->module=\"%s\" q->format=\"%s\" q->lineno=%u-%u\n",
    - query->function, query->filename,
    - query->module, query->format, query->first_lineno,
    - query->last_lineno);
    -
    + vpr_info_dq(query, "parsed");
    return 0;
    }

    --
    1.7.7.3


    \
     
     \ /
      Last update: 2011-11-30 21:01    [W:0.026 / U:1.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site