[PATCH 1/2 v3] scsi: add __print_hex() to ftrace

Kei Tokunaga
2010-02-15T09:46:51Z

From: Li Zefan <lizf@cn.fujitsu.com>

This is the same patch from v1.

__print_hex() prints values in an array in hex (w/o '0x') (space separated)
EX) 92 33 32 f3 ee 4d

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
Signed-off-by: Kei Tokunaga <tokunaga.keiich@jp.fujitsu.com>

---

linux-2.6.33-rc8-trace-kei/include/linux/ftrace_event.h | 3 +++
linux-2.6.33-rc8-trace-kei/include/trace/ftrace.h | 3 +++
linux-2.6.33-rc8-trace-kei/kernel/trace/trace_output.c | 15 +++++++++++++++
3 files changed, 21 insertions(+)

diff -puN include/linux/ftrace_event.h~ftrace_print_hex include/linux/ftrace_event.h
--- linux-2.6.33-rc8-trace/include/linux/ftrace_event.h~ftrace_print_hex 2010-02-15 17:25:31.000000000 +0900
+++ linux-2.6.33-rc8-trace-kei/include/linux/ftrace_event.h 2010-02-15 17:25:31.000000000 +0900
@@ -24,6 +24,9 @@ const char *ftrace_print_flags_seq(struc
const char *ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
const struct trace_print_flags *symbol_array);

+const char *ftrace_print_hex_seq(struct trace_seq *p,
+ const unsigned char *buf, int len);
+
/*
* The trace entry - the most basic unit of tracing. This is what
* is printed in the end as a single line in the trace output, such as:
diff -puN include/trace/ftrace.h~ftrace_print_hex include/trace/ftrace.h
--- linux-2.6.33-rc8-trace/include/trace/ftrace.h~ftrace_print_hex 2010-02-15 17:25:31.000000000 +0900
+++ linux-2.6.33-rc8-trace-kei/include/trace/ftrace.h 2010-02-15 17:25:31.000000000 +0900
@@ -321,6 +321,9 @@ ftrace_format_##name(struct ftrace_event
ftrace_print_symbols_seq(p, value, symbols); \
})

+#undef __print_hex
+#define __print_hex(buf, buf_len) ftrace_print_hex_seq(p, buf, buf_len)
+
#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
static enum print_line_t \
diff -puN kernel/trace/trace_output.c~ftrace_print_hex kernel/trace/trace_output.c
--- linux-2.6.33-rc8-trace/kernel/trace/trace_output.c~ftrace_print_hex 2010-02-15 17:25:31.000000000 +0900
+++ linux-2.6.33-rc8-trace-kei/kernel/trace/trace_output.c 2010-02-15 17:25:31.000000000 +0900
@@ -355,6 +355,21 @@ ftrace_print_symbols_seq(struct trace_se
}
EXPORT_SYMBOL(ftrace_print_symbols_seq);

+const char *
+ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len)
+{
+ int i;
+ const char *ret = p->buffer + p->len;
+
+ for (i = 0; i < buf_len; i++)
+ trace_seq_printf(p, "%s%2.2x", i == 0 ? "" : " ", buf[i]);
+
+ trace_seq_putc(p, 0);
+
+ return ret;
+}
+EXPORT_SYMBOL(ftrace_print_hex_seq);
+
#ifdef CONFIG_KRETPROBES
static inline const char *kretprobed(const char *name)
{

_