forked from luck/tmp_suning_uos_patched
2e26ca7150
When more than one header is included under CREATE_TRACE_POINTS the DECLARE_TRACE() macro is not defined back to its original meaning and the second include will fail to initialize the TRACE_EVENT() and DECLARE_TRACE() correctly. To fix this the tracepoint.h file moves the define of DECLARE_TRACE() out of the #ifdef _LINUX_TRACEPOINT_H protection (just like the define of the TRACE_EVENT()). This way the define_trace.h will undef the DECLARE_TRACE() at the end and allow new headers to start from scratch. This patch also requires fixing the include/events/napi.h It currently uses DECLARE_TRACE() and should be converted to a TRACE_EVENT() format. But I'll leave that change to the authors of that file. But since the napi.h file depends on using the CREATE_TRACE_POINTS and does not define its own DEFINE_TRACE() it must use the define_trace.h method instead. Cc: Neil Horman <nhorman@tuxdriver.com> Cc: David S. Miller <davem@davemloft.net> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/*
|
|
* Trace files that want to automate creationg of all tracepoints defined
|
|
* in their file should include this file. The following are macros that the
|
|
* trace file may define:
|
|
*
|
|
* TRACE_SYSTEM defines the system the tracepoint is for
|
|
*
|
|
* TRACE_INCLUDE_FILE if the file name is something other than TRACE_SYSTEM.h
|
|
* This macro may be defined to tell define_trace.h what file to include.
|
|
* Note, leave off the ".h".
|
|
*
|
|
* TRACE_INCLUDE_PATH if the path is something other than core kernel include/trace
|
|
* then this macro can define the path to use. Note, the path is relative to
|
|
* define_trace.h, not the file including it. Full path names for out of tree
|
|
* modules must be used.
|
|
*/
|
|
|
|
#ifdef CREATE_TRACE_POINTS
|
|
|
|
/* Prevent recursion */
|
|
#undef CREATE_TRACE_POINTS
|
|
|
|
#include <linux/stringify.h>
|
|
|
|
#undef TRACE_EVENT
|
|
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef TRACE_EVENT_FN
|
|
#define TRACE_EVENT_FN(name, proto, args, tstruct, \
|
|
assign, print, reg, unreg) \
|
|
DEFINE_TRACE_FN(name, reg, unreg)
|
|
|
|
#undef DEFINE_EVENT
|
|
#define DEFINE_EVENT(template, name, proto, args) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef DEFINE_EVENT_PRINT
|
|
#define DEFINE_EVENT_PRINT(template, name, proto, args, print) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef DECLARE_TRACE
|
|
#define DECLARE_TRACE(name, proto, args) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef TRACE_INCLUDE
|
|
#undef __TRACE_INCLUDE
|
|
|
|
#ifndef TRACE_INCLUDE_FILE
|
|
# define TRACE_INCLUDE_FILE TRACE_SYSTEM
|
|
# define UNDEF_TRACE_INCLUDE_FILE
|
|
#endif
|
|
|
|
#ifndef TRACE_INCLUDE_PATH
|
|
# define __TRACE_INCLUDE(system) <trace/events/system.h>
|
|
# define UNDEF_TRACE_INCLUDE_PATH
|
|
#else
|
|
# define __TRACE_INCLUDE(system) __stringify(TRACE_INCLUDE_PATH/system.h)
|
|
#endif
|
|
|
|
# define TRACE_INCLUDE(system) __TRACE_INCLUDE(system)
|
|
|
|
/* Let the trace headers be reread */
|
|
#define TRACE_HEADER_MULTI_READ
|
|
|
|
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
|
|
|
|
/* Make all open coded DECLARE_TRACE nops */
|
|
#undef DECLARE_TRACE
|
|
#define DECLARE_TRACE(name, proto, args)
|
|
|
|
#ifdef CONFIG_EVENT_TRACING
|
|
#include <trace/ftrace.h>
|
|
#endif
|
|
|
|
#undef TRACE_EVENT
|
|
#undef TRACE_EVENT_FN
|
|
#undef DECLARE_EVENT_CLASS
|
|
#undef DEFINE_EVENT
|
|
#undef DEFINE_EVENT_PRINT
|
|
#undef TRACE_HEADER_MULTI_READ
|
|
#undef DECLARE_TRACE
|
|
|
|
/* Only undef what we defined in this file */
|
|
#ifdef UNDEF_TRACE_INCLUDE_FILE
|
|
# undef TRACE_INCLUDE_FILE
|
|
# undef UNDEF_TRACE_INCLUDE_FILE
|
|
#endif
|
|
|
|
#ifdef UNDEF_TRACE_INCLUDE_PATH
|
|
# undef TRACE_INCLUDE_PATH
|
|
# undef UNDEF_TRACE_INCLUDE_PATH
|
|
#endif
|
|
|
|
/* We may be processing more files */
|
|
#define CREATE_TRACE_POINTS
|
|
|
|
#endif /* CREATE_TRACE_POINTS */
|