Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93f12f3 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Frederic Weisbecker
Browse files

tracing: Introduce TRACE_FIELD_ZERO() macro 



Use TRACE_FIELD_ZERO(type, item) instead of TRACE_FIELD_ZERO_CHAR(item).
This also includes a typo fix of TRACE_ZERO_CHAR() macro.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Przemysław Pawełczyk <przemyslaw@pawelczyk.it>
Cc: Roland McGrath <roland@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
LKML-Reference: <20090813203501.31965.30172.stgit@localhost.localdomain>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent bd1a5c84

kernel/trace/trace_event_types.h

+2 −2
Original line number Diff line number Diff line
@@ -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")

);

kernel/trace/trace_export.c

+8 −8
Original line number Diff line number Diff line
@@ -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)							\
@@ -92,9 +92,6 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ 


#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;
@@ -107,6 +104,9 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ 
#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
@@ -180,8 +180,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)	\