aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-04-10 09:36:00 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-04-14 12:57:28 -0400
commita8d154b009168337494fbf345671bab74d3e4b8b (patch)
tree4097612e1a5cc8bf7658542f7d0f51b815113eaf /include/trace
parentea20d9293ce423a39717ed4375393129a2e701f9 (diff)
tracing: create automated trace defines
This patch lowers the number of places a developer must modify to add new tracepoints. The current method to add a new tracepoint into an existing system is to write the trace point macro in the trace header with one of the macros TRACE_EVENT, TRACE_FORMAT or DECLARE_TRACE, then they must add the same named item into the C file with the macro DEFINE_TRACE(name) and then add the trace point. This change cuts out the needing to add the DEFINE_TRACE(name). Every file that uses the tracepoint must still include the trace/<type>.h file, but the one C file must also add a define before the including of that file. #define CREATE_TRACE_POINTS #include <trace/mytrace.h> This will cause the trace/mytrace.h file to also produce the C code necessary to implement the trace point. Note, if more than one trace/<type>.h is used to create the C code it is best to list them all together. #define CREATE_TRACE_POINTS #include <trace/foo.h> #include <trace/bar.h> #include <trace/fido.h> Thanks to Mathieu Desnoyers and Christoph Hellwig for coming up with the cleaner solution of the define above the includes over my first design to have the C code include a "special" header. This patch converts sched, irq and lockdep and skb to use this new method. Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: Zhao Lei <zhaolei@cn.fujitsu.com> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/define_trace.h75
-rw-r--r--include/trace/irq.h5
-rw-r--r--include/trace/kmem.h4
-rw-r--r--include/trace/lockdep.h3
-rw-r--r--include/trace/sched.h3
-rw-r--r--include/trace/skb.h3
6 files changed, 91 insertions, 2 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
new file mode 100644
index 000000000000..de9dc7d8508b
--- /dev/null
+++ b/include/trace/define_trace.h
@@ -0,0 +1,75 @@
1/*
2 * Trace files that want to automate creationg of all tracepoints defined
3 * in their file should include this file. The following are macros that the
4 * trace file may define:
5 *
6 * TRACE_SYSTEM defines the system the tracepoint is for
7 *
8 * TRACE_INCLUDE_FILE if the file name is something other than TRACE_SYSTEM.h
9 * This macro may be defined to tell define_trace.h what file to include.
10 * Note, leave off the ".h".
11 *
12 * TRACE_INCLUDE_PATH if the path is something other than core kernel include/trace
13 * then this macro can define the path to use. Note, the path is relative to
14 * define_trace.h, not the file including it. Full path names for out of tree
15 * modules must be used.
16 */
17
18#ifdef CREATE_TRACE_POINTS
19
20/* Prevent recursion */
21#undef CREATE_TRACE_POINTS
22
23#include <linux/stringify.h>
24
25#undef TRACE_EVENT
26#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
27 DEFINE_TRACE(name)
28
29#undef TRACE_FORMAT
30#define TRACE_FORMAT(name, proto, args, print) \
31 DEFINE_TRACE(name)
32
33#undef DECLARE_TRACE
34#define DECLARE_TRACE(name, proto, args) \
35 DEFINE_TRACE(name)
36
37#undef TRACE_INCLUDE
38#undef __TRACE_INCLUDE
39
40#ifndef TRACE_INCLUDE_FILE
41# define TRACE_INCLUDE_FILE TRACE_SYSTEM
42# define UNDEF_TRACE_INCLUDE_FILE
43#endif
44
45#ifndef TRACE_INCLUDE_PATH
46# define __TRACE_INCLUDE(system) <trace/system.h>
47# define UNDEF_TRACE_INCLUDE_FILE
48#else
49# define __TRACE_INCLUDE(system) __stringify(TRACE_INCLUDE_PATH/system.h)
50#endif
51
52# define TRACE_INCLUDE(system) __TRACE_INCLUDE(system)
53
54/* Let the trace headers be reread */
55#define TRACE_HEADER_MULTI_READ
56
57#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
58
59#undef TRACE_HEADER_MULTI_READ
60
61/* Only undef what we defined in this file */
62#ifdef UNDEF_TRACE_INCLUDE_FILE
63# undef TRACE_INCLUDE_PATH
64# undef UNDEF_TRACE_INCLUDE_FILE
65#endif
66
67#ifdef UNDEF_TRACE_INCLUDE_FILE
68# undef TRACE_INCLUDE_PATH
69# undef UNDEF_TRACE_INCLUDE_FILE
70#endif
71
72/* We may be processing more files */
73#define CREATE_TRACE_POINTS
74
75#endif /* CREATE_TRACE_POINTS */
diff --git a/include/trace/irq.h b/include/trace/irq.h
index 04ab4c652225..75e3468e4493 100644
--- a/include/trace/irq.h
+++ b/include/trace/irq.h
@@ -51,4 +51,7 @@ TRACE_FORMAT(softirq_exit,
51 TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec]) 51 TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])
52 ); 52 );
53 53
54#endif 54#endif /* _TRACE_IRQ_H */
55
56/* This part must be outside protection */
57#include <trace/define_trace.h>
diff --git a/include/trace/kmem.h b/include/trace/kmem.h
index d7d12189e5c8..c22c42f980b5 100644
--- a/include/trace/kmem.h
+++ b/include/trace/kmem.h
@@ -188,5 +188,7 @@ TRACE_EVENT(kmem_cache_free,
188 188
189 TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr) 189 TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
190); 190);
191#endif /* _TRACE_KMEM_H */
191 192
192#endif 193/* This part must be outside protection */
194#include <trace/define_trace.h>
diff --git a/include/trace/lockdep.h b/include/trace/lockdep.h
index 8ee7900b38c4..4d301e758de3 100644
--- a/include/trace/lockdep.h
+++ b/include/trace/lockdep.h
@@ -55,3 +55,6 @@ TRACE_EVENT(lock_acquired,
55#endif 55#endif
56 56
57#endif /* _TRACE_LOCKDEP_H */ 57#endif /* _TRACE_LOCKDEP_H */
58
59/* This part must be outside protection */
60#include <trace/define_trace.h>
diff --git a/include/trace/sched.h b/include/trace/sched.h
index 5b1cf4a28463..ffa1cab586b9 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -334,3 +334,6 @@ TRACE_EVENT(sched_signal_send,
334); 334);
335 335
336#endif /* _TRACE_SCHED_H */ 336#endif /* _TRACE_SCHED_H */
337
338/* This part must be outside protection */
339#include <trace/define_trace.h>
diff --git a/include/trace/skb.h b/include/trace/skb.h
index e6fd281f7f81..1e8fabb57c06 100644
--- a/include/trace/skb.h
+++ b/include/trace/skb.h
@@ -35,3 +35,6 @@ TRACE_EVENT(kfree_skb,
35); 35);
36 36
37#endif /* _TRACE_SKB_H */ 37#endif /* _TRACE_SKB_H */
38
39/* This part must be outside protection */
40#include <trace/define_trace.h>