diff options
author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-08-13 16:34:53 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-08-26 18:46:40 -0400 |
commit | bd1a5c849bdcc5c89e4a6a18216cd2b9a7a8a78f (patch) | |
tree | 1a807fef00b8a700d90683d4f1d480d95eec9669 /include/linux | |
parent | b1cf540f0e5278ecfe8532557e547d833ed269d7 (diff) |
tracing: Ftrace dynamic ftrace_event_call support
Add dynamic ftrace_event_call support to ftrace. Trace engines can add
new ftrace_event_call to ftrace on the fly. Each operator function of
the call takes an ftrace_event_call data structure as an argument,
because these functions may be shared among several ftrace_event_calls.
Changes from v13:
- Define remove_subsystem_dir() always (revirt a2ca5e03), because
trace_remove_event_call() uses it.
- Modify syscall tracer because of ftrace_event_call change.
[fweisbec@gmail.com: Fixed conflict against latest tracing/core]
Signed-off-by: Masami 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: <20090813203453.31965.71901.stgit@localhost.localdomain>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ftrace_event.h | 19 | ||||
-rw-r--r-- | include/linux/syscalls.h | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index ace2da9e0a0d..1ab3089b5c59 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h | |||
@@ -112,12 +112,12 @@ struct ftrace_event_call { | |||
112 | struct dentry *dir; | 112 | struct dentry *dir; |
113 | struct trace_event *event; | 113 | struct trace_event *event; |
114 | int enabled; | 114 | int enabled; |
115 | int (*regfunc)(void *); | 115 | int (*regfunc)(struct ftrace_event_call *); |
116 | void (*unregfunc)(void *); | 116 | void (*unregfunc)(struct ftrace_event_call *); |
117 | int id; | 117 | int id; |
118 | int (*raw_init)(void); | 118 | int (*raw_init)(struct ftrace_event_call *); |
119 | int (*show_format)(struct ftrace_event_call *call, | 119 | int (*show_format)(struct ftrace_event_call *, |
120 | struct trace_seq *s); | 120 | struct trace_seq *); |
121 | int (*define_fields)(struct ftrace_event_call *); | 121 | int (*define_fields)(struct ftrace_event_call *); |
122 | struct list_head fields; | 122 | struct list_head fields; |
123 | int filter_active; | 123 | int filter_active; |
@@ -147,11 +147,12 @@ enum { | |||
147 | FILTER_PTR_STRING, | 147 | FILTER_PTR_STRING, |
148 | }; | 148 | }; |
149 | 149 | ||
150 | extern int trace_define_field(struct ftrace_event_call *call, | ||
151 | const char *type, const char *name, | ||
152 | int offset, int size, int is_signed, | ||
153 | int filter_type); | ||
154 | extern int trace_define_common_fields(struct ftrace_event_call *call); | 150 | extern int trace_define_common_fields(struct ftrace_event_call *call); |
151 | extern int trace_define_field(struct ftrace_event_call *call, char *type, | ||
152 | char *name, int offset, int size, int is_signed, | ||
153 | int filter_type); | ||
154 | extern int trace_add_event_call(struct ftrace_event_call *call); | ||
155 | extern void trace_remove_event_call(struct ftrace_event_call *call); | ||
155 | 156 | ||
156 | #define is_signed_type(type) (((type)(-1)) < 0) | 157 | #define is_signed_type(type) (((type)(-1)) < 0) |
157 | 158 | ||
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index f124c8995555..646102eeff92 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -165,7 +165,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \ | |||
165 | struct trace_event enter_syscall_print_##sname = { \ | 165 | struct trace_event enter_syscall_print_##sname = { \ |
166 | .trace = print_syscall_enter, \ | 166 | .trace = print_syscall_enter, \ |
167 | }; \ | 167 | }; \ |
168 | static int init_enter_##sname(void) \ | 168 | static int init_enter_##sname(struct ftrace_event_call *call) \ |
169 | { \ | 169 | { \ |
170 | int num, id; \ | 170 | int num, id; \ |
171 | num = syscall_name_to_nr("sys"#sname); \ | 171 | num = syscall_name_to_nr("sys"#sname); \ |
@@ -202,7 +202,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \ | |||
202 | struct trace_event exit_syscall_print_##sname = { \ | 202 | struct trace_event exit_syscall_print_##sname = { \ |
203 | .trace = print_syscall_exit, \ | 203 | .trace = print_syscall_exit, \ |
204 | }; \ | 204 | }; \ |
205 | static int init_exit_##sname(void) \ | 205 | static int init_exit_##sname(struct ftrace_event_call *call) \ |
206 | { \ | 206 | { \ |
207 | int num, id; \ | 207 | int num, id; \ |
208 | num = syscall_name_to_nr("sys"#sname); \ | 208 | num = syscall_name_to_nr("sys"#sname); \ |