lkml.org 
[lkml]   [2009]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -tip -v12 07/11] tracing: Introduce TRACE_FIELD_ZERO() macro
    Date
    Use TRACE_FIELD_ZERO(type, item) instead of TRACE_FIELD_ZERO_CHAR(item).
    This also includes a fix of TRACE_ZERO_CHAR() macro.

    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    ---
    kernel/trace/trace_event_types.h | 4 ++--
    kernel/trace/trace_export.c | 16 ++++++++--------
    2 files changed, 10 insertions(+), 10 deletions(-)
    diff --git a/kernel/trace/trace_event_types.h b/kernel/trace/trace_event_types.h
    index 6db005e..e74f090 100644
    --- a/kernel/trace/trace_event_types.h
    +++ b/kernel/trace/trace_event_types.h
    @@ -109,7 +109,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, ignore,
    TRACE_STRUCT(
    TRACE_FIELD(unsigned long, ip, ip)
    TRACE_FIELD(char *, fmt, fmt)
    - TRACE_FIELD_ZERO_CHAR(buf)
    + TRACE_FIELD_ZERO(char, buf)
    ),
    TP_RAW_FMT("%08lx (%d) fmt:%p %s")
    );
    @@ -117,7 +117,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, ignore,
    TRACE_EVENT_FORMAT(print, TRACE_PRINT, print_entry, ignore,
    TRACE_STRUCT(
    TRACE_FIELD(unsigned long, ip, ip)
    - TRACE_FIELD_ZERO_CHAR(buf)
    + TRACE_FIELD_ZERO(char, buf)
    ),
    TP_RAW_FMT("%08lx (%d) fmt:%p %s")
    );
    diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
    index 7cee79d..23125b5 100644
    --- a/kernel/trace/trace_export.c
    +++ b/kernel/trace/trace_export.c
    @@ -42,9 +42,9 @@ extern void __bad_type_size(void);
    if (!ret) \
    return 0;

    -#undef TRACE_FIELD_ZERO_CHAR
    -#define TRACE_FIELD_ZERO_CHAR(item) \
    - ret = trace_seq_printf(s, "\tfield:char " #item ";\t" \
    +#undef TRACE_FIELD_ZERO
    +#define TRACE_FIELD_ZERO(type, item) \
    + ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t" \
    "offset:%u;\tsize:0;\n", \
    (unsigned int)offsetof(typeof(field), item)); \
    if (!ret) \
    @@ -90,9 +90,6 @@ ftrace_format_##call(struct ftrace_event_call *dummy, struct trace_seq *s)\

    #include "trace_event_types.h"

    -#undef TRACE_ZERO_CHAR
    -#define TRACE_ZERO_CHAR(arg)
    -
    #undef TRACE_FIELD
    #define TRACE_FIELD(type, item, assign)\
    entry->item = assign;
    @@ -105,6 +102,9 @@ ftrace_format_##call(struct ftrace_event_call *dummy, struct trace_seq *s)\
    #define TRACE_FIELD_SIGN(type, item, assign, is_signed) \
    TRACE_FIELD(type, item, assign)

    +#undef TRACE_FIELD_ZERO
    +#define TRACE_FIELD_ZERO(type, item)
    +
    #undef TP_CMD
    #define TP_CMD(cmd...) cmd

    @@ -176,8 +176,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
    if (ret) \
    return ret;

    -#undef TRACE_FIELD_ZERO_CHAR
    -#define TRACE_FIELD_ZERO_CHAR(item)
    +#undef TRACE_FIELD_ZERO
    +#define TRACE_FIELD_ZERO(type, item)

    #undef TRACE_EVENT_FORMAT
    #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \

    --
    Masami Hiramatsu

    Software Engineer
    Hitachi Computer Products (America), Inc.
    Software Solutions Division

    e-mail: mhiramat@redhat.com


    \
     
     \ /
      Last update: 2009-07-16 18:01    [from the cache]
    ©2003-2011 Jasper Spaans