trace_syscalls: remove duplicate init_enter_##sname()
PATCH 5/7 trace_syscalls: remove duplicate init_enter_##sname()
use only one init_syscall_trace instead of
many init_enter_##sname()/init_exit_##sname()
Signed-off-by Lai Jiangshan <[email protected]>
---
include/linux/syscalls.h +2 -28
@@ -158,19 +158,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \ - static int init_enter_##sname(struct ftrace_event_call *call) \ - { \ - int num, id; \ - num = __syscall_meta_##sname.syscall_nr; \ - if (num < 0) \ - return -ENOSYS; \ - id = register_ftrace_event(&enter_syscall_print_##sname);\ - if (!id) \ - return -ENODEV; \ - event_enter_##sname.id = id; \ - INIT_LIST_HEAD(&event_enter_##sname.fields); \ - return 0; \ - } \ TRACE_SYS_ENTER_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \
@@ -179,7 +166,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ .name = "sys_enter"#sname, \ .system = "syscalls", \ .event = &enter_syscall_print_##sname, \ - .raw_init = init_enter_##sname, \ + .raw_init = init_syscall_trace, \ .show_format = syscall_enter_format, \ .define_fields = syscall_enter_define_fields, \ .regfunc = reg_event_syscall_enter, \
@@ -194,19 +181,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \ - static int init_exit_##sname(struct ftrace_event_call *call) \ - { \ - int num, id; \ - num = __syscall_meta_##sname.syscall_nr; \ - if (num < 0) \ - return -ENOSYS; \ - id = register_ftrace_event(&exit_syscall_print_##sname);\ - if (!id) \ - return -ENODEV; \ - event_exit_##sname.id = id; \ - INIT_LIST_HEAD(&event_exit_##sname.fields); \ - return 0; \ - } \ TRACE_SYS_EXIT_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \
@@ -215,7 +189,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ .name = "sys_exit"#sname, \ .system = "syscalls", \ .event = &exit_syscall_print_##sname, \ - .raw_init = init_exit_##sname, \ + .raw_init = init_syscall_trace, \ .show_format = syscall_exit_format, \ .define_fields = syscall_exit_define_fields, \ .regfunc = reg_event_syscall_exit, \
include/trace/syscall.h +1 -0
@@ -32,6 +32,7 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr); +extern int init_syscall_trace (struct ftrace_event_call *call);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +12 -0
@@ -412,6 +412,18 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)mutex_unlock (&syscall_trace_lock); } +int init_syscall_trace (struct ftrace_event_call *call) +{ +int id; + + id =register_ftrace_event (call->event); +if (!id) +return -ENODEV ; + call->id = id; +INIT_LIST_HEAD (&call->fields); +return 0 ; +} +int __init init_ftrace_syscalls (void ) {struct syscall_metadata *meta;
[tip:perf/core] trace_syscalls: Remove duplicate init_enter_##sname()
Commit-ID: a1301da0997bf73c44dbe584e9070a13adc89672 Gitweb: http://git.kernel.org/tip/a1301da0997bf73c44dbe584e9070a13adc89672 Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 1 Dec 2009 16:23:55 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 1 Dec 2009 17:33:30 +0100
trace_syscalls: Remove duplicate init_enter_##sname()
use only one init_syscall_trace instead of many init_enter_##sname()/init_exit_##sname()
Signed-off-by Lai Jiangshan <[email protected]>
Acked-by Jason Baron <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/syscalls.h | 30 ++---------------------------- include/trace/syscall.h | 1 + kernel/trace/trace_syscalls.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 28 deletions(-)
include/linux/syscalls.h +2 -28
@@ -158,19 +158,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \ - static int init_enter_##sname(struct ftrace_event_call *call) \ - { \ - int num, id; \ - num = __syscall_meta_##sname.syscall_nr; \ - if (num < 0) \ - return -ENOSYS; \ - id = register_ftrace_event(&enter_syscall_print_##sname);\ - if (!id) \ - return -ENODEV; \ - event_enter_##sname.id = id; \ - INIT_LIST_HEAD(&event_enter_##sname.fields); \ - return 0; \ - } \ TRACE_SYS_ENTER_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \
@@ -179,7 +166,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ .name = "sys_enter"#sname, \ .system = "syscalls", \ .event = &enter_syscall_print_##sname, \ - .raw_init = init_enter_##sname, \ + .raw_init = init_syscall_trace, \ .show_format = syscall_enter_format, \ .define_fields = syscall_enter_define_fields, \ .regfunc = reg_event_syscall_enter, \
@@ -194,19 +181,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \ - static int init_exit_##sname(struct ftrace_event_call *call) \ - { \ - int num, id; \ - num = __syscall_meta_##sname.syscall_nr; \ - if (num < 0) \ - return -ENOSYS; \ - id = register_ftrace_event(&exit_syscall_print_##sname);\ - if (!id) \ - return -ENODEV; \ - event_exit_##sname.id = id; \ - INIT_LIST_HEAD(&event_exit_##sname.fields); \ - return 0; \ - } \ TRACE_SYS_EXIT_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \
@@ -215,7 +189,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ .name = "sys_exit"#sname, \ .system = "syscalls", \ .event = &exit_syscall_print_##sname, \ - .raw_init = init_exit_##sname, \ + .raw_init = init_syscall_trace, \ .show_format = syscall_exit_format, \ .define_fields = syscall_exit_define_fields, \ .regfunc = reg_event_syscall_exit, \
include/trace/syscall.h +1 -0
@@ -32,6 +32,7 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr); +extern int init_syscall_trace (struct ftrace_event_call *call);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +12 -0
@@ -412,6 +412,18 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)mutex_unlock (&syscall_trace_lock); } +int init_syscall_trace (struct ftrace_event_call *call) +{ +int id; + + id =register_ftrace_event (call->event); +if (!id) +return -ENODEV ; + call->id = id; +INIT_LIST_HEAD (&call->fields); +return 0 ; +} +int __init init_ftrace_syscalls (void ) {struct syscall_metadata *meta;