diff options
Diffstat (limited to 'trace-ftrace.c')
-rw-r--r-- | trace-ftrace.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/trace-ftrace.c b/trace-ftrace.c index 9dfe04d..6b4ab8e 100644 --- a/trace-ftrace.c +++ b/trace-ftrace.c | |||
@@ -28,13 +28,13 @@ static int get_field_val(struct trace_seq *s, void *data, | |||
28 | return 0; | 28 | return 0; |
29 | } | 29 | } |
30 | 30 | ||
31 | static int function_handler(struct trace_seq *s, void *data, int size, | 31 | static int function_handler(struct trace_seq *s, struct record *record, |
32 | struct event_format *event, int cpu, | 32 | struct event_format *event, int cpu) |
33 | unsigned long long nsecs) | ||
34 | { | 33 | { |
35 | struct pevent *pevent = event->pevent; | 34 | struct pevent *pevent = event->pevent; |
36 | unsigned long long function; | 35 | unsigned long long function; |
37 | const char *func; | 36 | const char *func; |
37 | void *data = record->data; | ||
38 | 38 | ||
39 | if (get_field_val(s, data, event, "ip", &function)) | 39 | if (get_field_val(s, data, event, "ip", &function)) |
40 | return trace_seq_putc(s, '!'); | 40 | return trace_seq_putc(s, '!'); |
@@ -220,13 +220,14 @@ static int print_graph_nested(struct trace_seq *s, | |||
220 | } | 220 | } |
221 | 221 | ||
222 | static int | 222 | static int |
223 | fgraph_ent_handler(struct trace_seq *s, void *data, int size, | 223 | fgraph_ent_handler(struct trace_seq *s, struct record *record, |
224 | struct event_format *event, int cpu, | 224 | struct event_format *event, int cpu) |
225 | unsigned long long nsecs) | ||
226 | { | 225 | { |
227 | struct record *rec; | 226 | struct record *rec; |
228 | void *copy_data; | 227 | void *copy_data; |
229 | unsigned long long val, pid; | 228 | unsigned long long val, pid; |
229 | void *data = record->data; | ||
230 | int size = record->size; | ||
230 | int ret; | 231 | int ret; |
231 | 232 | ||
232 | if (get_field_val(s, data, event, "common_pid", &pid)) | 233 | if (get_field_val(s, data, event, "common_pid", &pid)) |
@@ -258,12 +259,12 @@ fgraph_ent_handler(struct trace_seq *s, void *data, int size, | |||
258 | } | 259 | } |
259 | 260 | ||
260 | static int | 261 | static int |
261 | fgraph_ret_handler(struct trace_seq *s, void *data, int size, | 262 | fgraph_ret_handler(struct trace_seq *s, struct record *record, |
262 | struct event_format *event, int cpu, | 263 | struct event_format *event, int cpu) |
263 | unsigned long long nsecs) | ||
264 | { | 264 | { |
265 | unsigned long long rettime, calltime; | 265 | unsigned long long rettime, calltime; |
266 | unsigned long long duration, depth; | 266 | unsigned long long duration, depth; |
267 | void *data = record->data; | ||
267 | int i; | 268 | int i; |
268 | 269 | ||
269 | if (get_field_val(s, data, event, "rettime", &rettime)) | 270 | if (get_field_val(s, data, event, "rettime", &rettime)) |
@@ -291,13 +292,13 @@ fgraph_ret_handler(struct trace_seq *s, void *data, int size, | |||
291 | } | 292 | } |
292 | 293 | ||
293 | static int | 294 | static int |
294 | trace_stack_handler(struct trace_seq *s, void *data, int size, | 295 | trace_stack_handler(struct trace_seq *s, struct record *record, |
295 | struct event_format *event, int cpu, | 296 | struct event_format *event, int cpu) |
296 | unsigned long long nsecs) | ||
297 | { | 297 | { |
298 | struct format_field *field; | 298 | struct format_field *field; |
299 | unsigned long long addr; | 299 | unsigned long long addr; |
300 | const char *func; | 300 | const char *func; |
301 | void *data = record->data; | ||
301 | int ret; | 302 | int ret; |
302 | int i; | 303 | int i; |
303 | 304 | ||