lkml.org 
[lkml]   [2013]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] printk/tracing: rework console tracing
    From 0a2bd3ad03fc9acd125f4eeb585a1e09027a182a Mon Sep 17 00:00:00 2001
    From: "zhangwei(Jovi)" <jovi.zhangwei@huawei.com>
    Date: Mon, 4 Mar 2013 17:45:10 +0800
    Subject: [PATCH] printk/tracing: rework console tracing

    commit 7ff9554bb(printk: convert byte-buffer to variable-length record buffer)
    removed start and end parameters in call_console_drivers,
    but those parameters still exists in include/trace/events/printk.h.

    Without start and end parameters handling, printk tracing became more simple as:
    trace_console(text, len);

    Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
    ---
    include/trace/events/printk.h | 25 ++++++-------------------
    kernel/printk.c | 2 +-
    2 files changed, 7 insertions(+), 20 deletions(-)

    diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h
    index 94ec79c..c008bc9 100644
    --- a/include/trace/events/printk.h
    +++ b/include/trace/events/printk.h
    @@ -6,31 +6,18 @@

    #include <linux/tracepoint.h>

    -TRACE_EVENT_CONDITION(console,
    - TP_PROTO(const char *log_buf, unsigned start, unsigned end,
    - unsigned log_buf_len),
    +TRACE_EVENT(console,
    + TP_PROTO(const char *text, size_t len),

    - TP_ARGS(log_buf, start, end, log_buf_len),
    -
    - TP_CONDITION(start != end),
    + TP_ARGS(text, len),

    TP_STRUCT__entry(
    - __dynamic_array(char, msg, end - start + 1)
    + __dynamic_array(char, msg, len + 1)
    ),

    TP_fast_assign(
    - if ((start & (log_buf_len - 1)) > (end & (log_buf_len - 1))) {
    - memcpy(__get_dynamic_array(msg),
    - log_buf + (start & (log_buf_len - 1)),
    - log_buf_len - (start & (log_buf_len - 1)));
    - memcpy((char *)__get_dynamic_array(msg) +
    - log_buf_len - (start & (log_buf_len - 1)),
    - log_buf, end & (log_buf_len - 1));
    - } else
    - memcpy(__get_dynamic_array(msg),
    - log_buf + (start & (log_buf_len - 1)),
    - end - start);
    - ((char *)__get_dynamic_array(msg))[end - start] = 0;
    + memcpy(__get_dynamic_array(msg), text, len);
    + ((char *)__get_dynamic_array(msg))[len] = 0;
    ),

    TP_printk("%s", __get_str(msg))
    diff --git a/kernel/printk.c b/kernel/printk.c
    index 0b31715..e1c687d 100644
    --- a/kernel/printk.c
    +++ b/kernel/printk.c
    @@ -1266,7 +1266,7 @@ static void call_console_drivers(int level, const char *text, size_t len)
    {
    struct console *con;

    - trace_console(text, 0, len, len);
    + trace_console(text, len);

    if (level >= console_loglevel && !ignore_loglevel)
    return;
    --
    1.7.9.7



    \
     
     \ /
      Last update: 2013-03-04 12:02    [W:5.647 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site