diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-04-23 10:38:03 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 14:33:15 -0400 |
| commit | 32c0edaeaad74a7883e736ae0f3798784cfc2a80 (patch) | |
| tree | e70784ed690172cb0f1b4365b93aa077d40219c9 /include/trace/ftrace.h | |
| parent | 80decc70afc57c87eee9d6b836aec2ecacba3457 (diff) | |
tracing: Remove duplicate id information in event structure
Now that the trace_event structure is embedded in the ftrace_event_call
structure, there is no need for the ftrace_event_call id field.
The id field is the same as the trace_event type field.
Removing the id and re-arranging the structure brings down the tracepoint
footprint by another 5K.
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4895024 1023812 861512 6780348 6775bc vmlinux.print
4894944 1018052 861512 6774508 675eec vmlinux.id
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 824141d5cf04..4866c109fa9a 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
| @@ -150,7 +150,7 @@ | |||
| 150 | * | 150 | * |
| 151 | * entry = iter->ent; | 151 | * entry = iter->ent; |
| 152 | * | 152 | * |
| 153 | * if (entry->type != event_<call>.id) { | 153 | * if (entry->type != event_<call>->event.type) { |
| 154 | * WARN_ON_ONCE(1); | 154 | * WARN_ON_ONCE(1); |
| 155 | * return TRACE_TYPE_UNHANDLED; | 155 | * return TRACE_TYPE_UNHANDLED; |
| 156 | * } | 156 | * } |
| @@ -221,7 +221,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ | |||
| 221 | \ | 221 | \ |
| 222 | entry = iter->ent; \ | 222 | entry = iter->ent; \ |
| 223 | \ | 223 | \ |
| 224 | if (entry->type != event->id) { \ | 224 | if (entry->type != event->event.type) { \ |
| 225 | WARN_ON_ONCE(1); \ | 225 | WARN_ON_ONCE(1); \ |
| 226 | return TRACE_TYPE_UNHANDLED; \ | 226 | return TRACE_TYPE_UNHANDLED; \ |
| 227 | } \ | 227 | } \ |
| @@ -257,7 +257,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ | |||
| 257 | \ | 257 | \ |
| 258 | entry = iter->ent; \ | 258 | entry = iter->ent; \ |
| 259 | \ | 259 | \ |
| 260 | if (entry->type != event_##call.id) { \ | 260 | if (entry->type != event_##call.event.type) { \ |
| 261 | WARN_ON_ONCE(1); \ | 261 | WARN_ON_ONCE(1); \ |
| 262 | return TRACE_TYPE_UNHANDLED; \ | 262 | return TRACE_TYPE_UNHANDLED; \ |
| 263 | } \ | 263 | } \ |
| @@ -409,7 +409,7 @@ static inline notrace int ftrace_get_offsets_##call( \ | |||
| 409 | * __data_size = ftrace_get_offsets_<call>(&__data_offsets, args); | 409 | * __data_size = ftrace_get_offsets_<call>(&__data_offsets, args); |
| 410 | * | 410 | * |
| 411 | * event = trace_current_buffer_lock_reserve(&buffer, | 411 | * event = trace_current_buffer_lock_reserve(&buffer, |
| 412 | * event_<call>.id, | 412 | * event_<call>->event.type, |
| 413 | * sizeof(*entry) + __data_size, | 413 | * sizeof(*entry) + __data_size, |
| 414 | * irq_flags, pc); | 414 | * irq_flags, pc); |
| 415 | * if (!event) | 415 | * if (!event) |
| @@ -510,7 +510,7 @@ ftrace_raw_event_##call(void *__data, proto) \ | |||
| 510 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ | 510 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ |
| 511 | \ | 511 | \ |
| 512 | event = trace_current_buffer_lock_reserve(&buffer, \ | 512 | event = trace_current_buffer_lock_reserve(&buffer, \ |
| 513 | event_call->id, \ | 513 | event_call->event.type, \ |
| 514 | sizeof(*entry) + __data_size, \ | 514 | sizeof(*entry) + __data_size, \ |
| 515 | irq_flags, pc); \ | 515 | irq_flags, pc); \ |
| 516 | if (!event) \ | 516 | if (!event) \ |
| @@ -711,7 +711,7 @@ perf_trace_##call(void *__data, proto) \ | |||
| 711 | "profile buffer not large enough")) \ | 711 | "profile buffer not large enough")) \ |
| 712 | return; \ | 712 | return; \ |
| 713 | entry = (struct ftrace_raw_##call *)perf_trace_buf_prepare( \ | 713 | entry = (struct ftrace_raw_##call *)perf_trace_buf_prepare( \ |
| 714 | __entry_size, event_call->id, &rctx, &irq_flags); \ | 714 | __entry_size, event_call->event.type, &rctx, &irq_flags); \ |
| 715 | if (!entry) \ | 715 | if (!entry) \ |
| 716 | return; \ | 716 | return; \ |
| 717 | tstruct \ | 717 | tstruct \ |