Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754646Ab0DZUCv (ORCPT ); Mon, 26 Apr 2010 16:02:51 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:50727 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408Ab0DZUCq (ORCPT ); Mon, 26 Apr 2010 16:02:46 -0400 X-Authority-Analysis: v=1.1 cv=2/WNtoURsBD4grC4Rqfj62/w1mAETqRJkFX1sgq41IM= c=1 sm=0 a=I7-BeF59Y58A:10 a=GzHTLUccyWwA:10 a=gMqfjgEr1zLu/65IO0LwxA==:17 a=20KFwNOVAAAA:8 a=meVymXHHAAAA:8 a=u4j5mRHdNQ9NR39BCW4A:9 a=cSeOugiimqqY21-ewWIA:7 a=c-wY0Ox1V0oVXGOvwB9QF9BmK9IA:4 a=jEp0ucaQiEUA:10 a=jeBq3FmKZ4MA:10 a=gMqfjgEr1zLu/65IO0LwxA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.89.75 Message-Id: <20100426200242.757929062@goodmis.org> User-Agent: quilt/0.48-1 Date: Mon, 26 Apr 2010 15:50:30 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Frederic Weisbecker , Arnaldo Carvalho de Melo , Mathieu Desnoyers , Lai Jiangshan , Li Zefan , Masami Hiramatsu , Christoph Hellwig Subject: [PATCH 06/10][RFC] tracing: Move raw_init from events to class References: <20100426195024.256424113@goodmis.org> Content-Disposition: inline; filename=0006-tracing-Move-raw_init-from-events-to-class.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8401 Lines: 222 From: Steven Rostedt The raw_init function pointer in the event is used to initialize various kinds of events. The type of initialization needed is usually classed to the kind of event it is. Two events with the same class will always have the same initialization function, so it makes sense to move this to the class structure. Perhaps even making a special system structure would work since the initialization is the same for all events within a system. But since there's no system structure (yet), this will just move it to the class. text data bss dec hex filename 5788186 1337252 9351592 16477030 fb6b66 vmlinux.orig 5774567 1297492 9351592 16423651 fa9ae3 vmlinux.fields 5774510 1293204 9351592 16419306 fa89ea vmlinux.init The text grew very slightly, but this is a constant growth that happened with the changing of the C files that call the init code. The bigger savings is the data which will be saved the more events share a class. Signed-off-by: Steven Rostedt --- include/linux/ftrace_event.h | 2 +- include/linux/syscalls.h | 2 -- include/trace/ftrace.h | 8 ++++---- kernel/trace/trace_events.c | 12 ++++++------ kernel/trace/trace_export.c | 2 +- kernel/trace/trace_kprobe.c | 6 +++--- kernel/trace/trace_syscalls.c | 2 ++ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 1e2c8f5..655de69 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -131,6 +131,7 @@ struct ftrace_event_class { int (*define_fields)(struct ftrace_event_call *); struct list_head *(*get_fields)(struct ftrace_event_call *); struct list_head fields; + int (*raw_init)(struct ftrace_event_call *); }; struct ftrace_event_call { @@ -142,7 +143,6 @@ struct ftrace_event_call { int enabled; int id; const char *print_fmt; - int (*raw_init)(struct ftrace_event_call *); int filter_active; struct event_filter *filter; void *mod; diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index ef4f81c..a0db1e8 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -135,7 +135,6 @@ extern struct ftrace_event_class event_class_syscall_exit; .name = "sys_enter"#sname, \ .class = &event_class_syscall_enter, \ .event = &enter_syscall_print_##sname, \ - .raw_init = init_syscall_trace, \ .data = (void *)&__syscall_meta_##sname,\ } @@ -153,7 +152,6 @@ extern struct ftrace_event_class event_class_syscall_exit; .name = "sys_exit"#sname, \ .class = &event_class_syscall_exit, \ .event = &exit_syscall_print_##sname, \ - .raw_init = init_syscall_trace, \ .data = (void *)&__syscall_meta_##sname,\ } diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index e6ec392..de0d96c 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -430,8 +430,9 @@ static inline notrace int ftrace_get_offsets_##call( \ * static struct ftrace_event_class __used event_class_