Commit 509e760c authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Steven Rostedt
Browse files

tracing: Add print_fmt field 



This is part of a patch set that removes the show_format method
in the ftrace event macros.

The print_fmt field is added to hold the string that shows
the print_fmt in the event format files. This patch only adds
the field but it is currently not used. Later patches will use
this field to enable us to remove the show_format field
and function.

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4B273D3E.2000704@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 809826a3

include/linux/ftrace_event.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct ftrace_event_call { 
	int			(*regfunc)(struct ftrace_event_call *);

	void			(*unregfunc)(struct ftrace_event_call *);

	int			id;

	const char		*print_fmt;

	int			(*raw_init)(struct ftrace_event_call *);

	int			(*show_format)(struct ftrace_event_call *,

					       struct trace_seq *);

include/trace/ftrace.h

+27 −1
Original line number Diff line number Diff line
@@ -722,8 +722,20 @@ static struct trace_event ftrace_event_type_##call = { \ 


#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)



#undef __entry

#define __entry REC



#undef __print_flags

#undef __print_symbolic

#undef __get_dynamic_array

#undef __get_str



#undef TP_printk

#define TP_printk(fmt, args...) "\"" fmt "\", "  __stringify(args)



#undef DECLARE_EVENT_CLASS

#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)

#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)	\

static const char print_fmt_##call[] = print;



#undef DEFINE_EVENT

#define DEFINE_EVENT(template, call, proto, args)			\
@@ -737,6 +749,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.raw_init		= trace_event_raw_init,			\

	.regfunc		= ftrace_raw_reg_event_##call,		\

	.unregfunc		= ftrace_raw_unreg_event_##call,	\

	.print_fmt		= print_fmt_##template,			\

	.show_format		= ftrace_format_##template,		\

	.define_fields		= ftrace_define_fields_##template,	\

	_TRACE_PROFILE_INIT(call)					\
@@ -745,6 +758,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
#undef DEFINE_EVENT_PRINT

#define DEFINE_EVENT_PRINT(template, call, proto, args, print)		\

									\

static const char print_fmt_##call[] = print;				\

									\

static struct ftrace_event_call __used					\

__attribute__((__aligned__(4)))						\

__attribute__((section("_ftrace_events"))) event_##call = {		\
@@ -754,6 +769,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.raw_init		= trace_event_raw_init,			\

	.regfunc		= ftrace_raw_reg_event_##call,		\

	.unregfunc		= ftrace_raw_unreg_event_##call,	\

	.print_fmt		= print_fmt_##call,			\

	.show_format		= ftrace_format_##call,			\

	.define_fields		= ftrace_define_fields_##template,	\

	_TRACE_PROFILE_INIT(call)					\
@@ -837,6 +853,16 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 


#ifdef CONFIG_EVENT_PROFILE



#undef __entry

#define __entry entry



#undef __get_dynamic_array

#define __get_dynamic_array(field)	\

		((void *)__entry + (__entry->__data_loc_##field & 0xffff))



#undef __get_str

#define __get_str(field) (char *)__get_dynamic_array(field)



#undef __perf_addr

#define __perf_addr(a) __addr = (a)

kernel/trace/trace_export.c

+7 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call) 
	return 0;

}



#undef __entry

#define __entry REC



#undef __field

#define __field(type, item)
@@ -218,6 +221,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call) 
#undef __dynamic_array

#define __dynamic_array(type, item)



#undef F_printk

#define F_printk(fmt, args...) #fmt ", "  __stringify(args)



#undef FTRACE_ENTRY

#define FTRACE_ENTRY(call, struct_name, type, tstruct, print)		\

									\
@@ -228,6 +234,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.id			= type,					\

	.system			= __stringify(TRACE_SYSTEM),		\

	.raw_init		= ftrace_raw_init_event,		\

	.print_fmt		= print,				\

	.show_format		= ftrace_format_##call,			\

	.define_fields		= ftrace_define_fields_##call,		\

};									\

CRA Git | Maintained and supported by SUSTech CRA and CCSE