GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trace_syscalls: Remove duplicate init_enter_##sname()

Browse source 
use only one init_syscall_trace instead of
many init_enter_##sname()/init_exit_##sname()

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4B14D29B.6090708@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Lai Jiangshan 2009-12-01 16:23:55 +08:00 • committed by Ingo Molnar
parent c252f65793
commit a1301da099
3 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
include/linux/syscalls.h
View file

@ -158,19 +158,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
struct trace_event enter_syscall_print_##sname = { \ struct trace_event enter_syscall_print_##sname = { \
.trace = print_syscall_enter, \ .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); \ TRACE_SYS_ENTER_PROFILE(sname); \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
__attribute__((__aligned__(4))) \ __attribute__((__aligned__(4))) \
@ -179,7 +166,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
.name = "sys_enter"#sname, \ .name = "sys_enter"#sname, \
.system = "syscalls", \ .system = "syscalls", \
.event = &enter_syscall_print_##sname, \ .event = &enter_syscall_print_##sname, \
.raw_init = init_enter_##sname, \ .raw_init = init_syscall_trace, \
.show_format = syscall_enter_format, \ .show_format = syscall_enter_format, \
.define_fields = syscall_enter_define_fields, \ .define_fields = syscall_enter_define_fields, \
.regfunc = reg_event_syscall_enter, \ .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 = { \ struct trace_event exit_syscall_print_##sname = { \
.trace = print_syscall_exit, \ .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); \ TRACE_SYS_EXIT_PROFILE(sname); \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
__attribute__((__aligned__(4))) \ __attribute__((__aligned__(4))) \
@ -215,7 +189,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
.name = "sys_exit"#sname, \ .name = "sys_exit"#sname, \
.system = "syscalls", \ .system = "syscalls", \
.event = &exit_syscall_print_##sname, \ .event = &exit_syscall_print_##sname, \
.raw_init = init_exit_##sname, \ .raw_init = init_syscall_trace, \
.show_format = syscall_exit_format, \ .show_format = syscall_exit_format, \
.define_fields = syscall_exit_define_fields, \ .define_fields = syscall_exit_define_fields, \
.regfunc = reg_event_syscall_exit, \ .regfunc = reg_event_syscall_exit, \

1
include/trace/syscall.h
View file

@ -32,6 +32,7 @@ struct syscall_metadata {
#ifdef CONFIG_FTRACE_SYSCALLS #ifdef CONFIG_FTRACE_SYSCALLS
extern unsigned long arch_syscall_addr(int nr); 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, extern int syscall_enter_format(struct ftrace_event_call *call,
struct trace_seq *s); struct trace_seq *s);

12
kernel/trace/trace_syscalls.c
View file

@ -412,6 +412,18 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
mutex_unlock(&syscall_trace_lock); 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) int __init init_ftrace_syscalls(void)
{ {
struct syscall_metadata *meta; struct syscall_metadata *meta;