Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699Ab0BOJqx (ORCPT ); Mon, 15 Feb 2010 04:46:53 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:51946 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754334Ab0BOJqv (ORCPT ); Mon, 15 Feb 2010 04:46:51 -0500 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Message-ID: <4B7917EA.5010401@jp.fujitsu.com> Date: Mon, 15 Feb 2010 18:46:18 +0900 From: Kei Tokunaga User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: "linux-scsi@vger.kernel.org" , James Bottomley , Ingo Molnar , Steven Rostedt , Frederic Weisbecker , "Martin K. Petersen" CC: Tomohiro Kusumi , lkml , Li Zefan , Xiao Guangrong , Kei Tokunaga Subject: [PATCH 1/2 v3] scsi: add __print_hex() to ftrace References: <4B7914CD.8020508@jp.fujitsu.com> In-Reply-To: <4B7914CD.8020508@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3004 Lines: 80 From: Li Zefan 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 Signed-off-by: Tomohiro Kusumi Signed-off-by: Kei Tokunaga --- 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) { _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/