Skip to content

Commit

Permalink
printk/tracing: rework console tracing
Browse files Browse the repository at this point in the history
Commit 7ff9554 ("printk: convert byte-buffer to variable-length
record buffer") removed start and end parameters from
call_console_drivers, but those parameters still exist 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>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Kay Sievers <kay@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
zhangwei(Jovi) authored and Linus Torvalds committed Apr 30, 2013
1 parent 2fb0815 commit 07c65f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 20 deletions.
25 changes: 6 additions & 19 deletions include/trace/events/printk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,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;
Expand Down

0 comments on commit 07c65f4

Please sign in to comment.