trace_syscalls: remove enter_id exit_id
PATCH 3/7 trace_syscalls: remove enter_id exit_id
use ->enter_event->id instead of ->enter_id
use ->exit_event->id instead of ->exit_id
Signed-off-by Lai Jiangshan <[email protected]>
---
include/linux/syscalls.h +0 -2
@@ -168,7 +168,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \if (!id) \return -ENODEV ; \ event_enter_##sname.id = id; \ - set_syscall_enter_id(num, id); \ INIT_LIST_HEAD(&event_enter_##sname.fields); \ return 0; \ } \
@@ -205,7 +204,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \if (!id) \return -ENODEV ; \ event_exit_##sname.id = id; \ - set_syscall_exit_id(num, id); \ INIT_LIST_HEAD(&event_exit_##sname.fields); \ return 0; \ } \
include/trace/syscall.h +0 -6
@@ -15,8 +15,6 @@* @nb_args: number of parameters it takes * @types: list of types as strings * @args: list of args as strings (args[i] matches types[i]) -* @enter_id: associated ftrace enter event id -* @exit_id: associated ftrace exit event id * @enter_event: associated syscall_enter trace event * @exit_event: associated syscall_exit trace event */
@@ -25,8 +23,6 @@ struct syscall_metadata {int nb_args;const char **types;const char **args; -int enter_id; -int exit_id;struct ftrace_event_call *enter_event;struct ftrace_event_call *exit_event;
@@ -35,8 +31,6 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr);extern int syscall_name_to_nr (const char *name); -void set_syscall_enter_id (int num,int id); -void set_syscall_exit_id (int num,int id);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +10 -20
@@ -67,16 +67,6 @@ int syscall_name_to_nr(const char *name)return -1 ; } -void set_syscall_enter_id (int num,int id) -{ - syscalls_metadata[num]->enter_id = id; -} - -void set_syscall_exit_id (int num,int id) -{ - syscalls_metadata[num]->exit_id = id; -} -enum print_line_t print_syscall_enter (struct trace_iterator *iter,int flags) {
@@ -93,7 +83,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags)if (!entry) goto end; -if (entry->enter_id != ent->type) { +if (entry->enter_event->id != ent->type) {WARN_ON_ONCE (1 ); goto end; }
@@ -148,7 +138,7 @@ print_syscall_exit(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -if (entry->exit_id != ent->type) { +if (entry->exit_event->id != ent->type) {WARN_ON_ONCE (1 );return TRACE_TYPE_UNHANDLED ; }
@@ -302,8 +292,8 @@ void ftrace_syscall_enter(struct pt_regs *regs, long id) size =sizeof (*entry) +sizeof (unsigned long ) * sys_data->nb_args; - event =trace_current_buffer_lock_reserve (&buffer, sys_data->enter_id, - size,0 ,0 ); + event =trace_current_buffer_lock_reserve (&buffer, + sys_data->enter_event->id, size,0 ,0 );if (!event)return ;
@@ -334,8 +324,8 @@ void ftrace_syscall_exit(struct pt_regs *regs, long ret)if (!sys_data)return ; - event =trace_current_buffer_lock_reserve (&buffer, sys_data->exit_id, -sizeof (*entry),0 ,0 ); + event =trace_current_buffer_lock_reserve (&buffer, + sys_data->exit_event->id,sizeof (*entry),0 ,0 );if (!event)return ;
@@ -510,11 +500,11 @@ static void prof_syscall_enter(struct pt_regs *regs, long id) rec = (struct syscall_trace_enter *) raw_data;tracing_generic_entry_update (&rec->ent,0 ,0 ); - rec->ent.type = sys_data->enter_id; + rec->ent.type = sys_data->enter_event->id; rec->nr = syscall_nr;syscall_get_arguments (current, regs,0 , sys_data->nb_args, (unsigned long *)&rec->args); -perf_tp_event (sys_data->enter_id,0 ,1 , rec, size); +perf_tp_event (sys_data->enter_event->id,0 ,1 , rec, size); end:perf_swevent_put_recursion_context (rctx);
@@ -615,11 +605,11 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret) rec = (struct syscall_trace_exit *)raw_data;tracing_generic_entry_update (&rec->ent,0 ,0 ); - rec->ent.type = sys_data->exit_id; + rec->ent.type = sys_data->exit_event->id; rec->nr = syscall_nr; rec->ret =syscall_get_return_value (current, regs); -perf_tp_event (sys_data->exit_id,0 ,1 , rec, size); +perf_tp_event (sys_data->exit_event->id,0 ,1 , rec, size); end:perf_swevent_put_recursion_context (rctx);
[tip:perf/core] trace_syscalls: Remove enter_id exit_id
Commit-ID: fcc19438dda38dacc8c144e2db3ebc6b9fd4f8b8 Gitweb: http://git.kernel.org/tip/fcc19438dda38dacc8c144e2db3ebc6b9fd4f8b8 Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 1 Dec 2009 16:23:36 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 1 Dec 2009 17:33:29 +0100
trace_syscalls: Remove enter_id exit_id
use ->enter_event->id instead of ->enter_id use ->exit_event->id instead of ->exit_id
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 | 2 -- include/trace/syscall.h | 6 ------ kernel/trace/trace_syscalls.c | 30 ++++++++++-------------------- 3 files changed, 10 insertions(+), 28 deletions(-)
include/linux/syscalls.h +0 -2
@@ -168,7 +168,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \if (!id) \return -ENODEV ; \ event_enter_##sname.id = id; \ - set_syscall_enter_id(num, id); \ INIT_LIST_HEAD(&event_enter_##sname.fields); \ return 0; \ } \
@@ -205,7 +204,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \if (!id) \return -ENODEV ; \ event_exit_##sname.id = id; \ - set_syscall_exit_id(num, id); \ INIT_LIST_HEAD(&event_exit_##sname.fields); \ return 0; \ } \
include/trace/syscall.h +0 -6
@@ -15,8 +15,6 @@* @nb_args: number of parameters it takes * @types: list of types as strings * @args: list of args as strings (args[i] matches types[i]) -* @enter_id: associated ftrace enter event id -* @exit_id: associated ftrace exit event id * @enter_event: associated syscall_enter trace event * @exit_event: associated syscall_exit trace event */
@@ -25,8 +23,6 @@ struct syscall_metadata {int nb_args;const char **types;const char **args; -int enter_id; -int exit_id;struct ftrace_event_call *enter_event;struct ftrace_event_call *exit_event;
@@ -35,8 +31,6 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr);extern int syscall_name_to_nr (const char *name); -void set_syscall_enter_id (int num,int id); -void set_syscall_exit_id (int num,int id);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +10 -20
@@ -67,16 +67,6 @@ int syscall_name_to_nr(const char *name)return -1 ; } -void set_syscall_enter_id (int num,int id) -{ - syscalls_metadata[num]->enter_id = id; -} - -void set_syscall_exit_id (int num,int id) -{ - syscalls_metadata[num]->exit_id = id; -} -enum print_line_t print_syscall_enter (struct trace_iterator *iter,int flags) {
@@ -93,7 +83,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags)if (!entry) goto end; -if (entry->enter_id != ent->type) { +if (entry->enter_event->id != ent->type) {WARN_ON_ONCE (1 ); goto end; }
@@ -148,7 +138,7 @@ print_syscall_exit(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -if (entry->exit_id != ent->type) { +if (entry->exit_event->id != ent->type) {WARN_ON_ONCE (1 );return TRACE_TYPE_UNHANDLED ; }
@@ -302,8 +292,8 @@ void ftrace_syscall_enter(struct pt_regs *regs, long id) size =sizeof (*entry) +sizeof (unsigned long ) * sys_data->nb_args; - event =trace_current_buffer_lock_reserve (&buffer, sys_data->enter_id, - size,0 ,0 ); + event =trace_current_buffer_lock_reserve (&buffer, + sys_data->enter_event->id, size,0 ,0 );if (!event)return ;
@@ -334,8 +324,8 @@ void ftrace_syscall_exit(struct pt_regs *regs, long ret)if (!sys_data)return ; - event =trace_current_buffer_lock_reserve (&buffer, sys_data->exit_id, -sizeof (*entry),0 ,0 ); + event =trace_current_buffer_lock_reserve (&buffer, + sys_data->exit_event->id,sizeof (*entry),0 ,0 );if (!event)return ;
@@ -510,11 +500,11 @@ static void prof_syscall_enter(struct pt_regs *regs, long id) rec = (struct syscall_trace_enter *) raw_data;tracing_generic_entry_update (&rec->ent,0 ,0 ); - rec->ent.type = sys_data->enter_id; + rec->ent.type = sys_data->enter_event->id; rec->nr = syscall_nr;syscall_get_arguments (current, regs,0 , sys_data->nb_args, (unsigned long *)&rec->args); -perf_tp_event (sys_data->enter_id,0 ,1 , rec, size); +perf_tp_event (sys_data->enter_event->id,0 ,1 , rec, size); end:perf_swevent_put_recursion_context (rctx);
@@ -615,11 +605,11 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret) rec = (struct syscall_trace_exit *)raw_data;tracing_generic_entry_update (&rec->ent,0 ,0 ); - rec->ent.type = sys_data->exit_id; + rec->ent.type = sys_data->exit_event->id; rec->nr = syscall_nr; rec->ret =syscall_get_return_value (current, regs); -perf_tp_event (sys_data->exit_id,0 ,1 , rec, size); +perf_tp_event (sys_data->exit_event->id,0 ,1 , rec, size); end:perf_swevent_put_recursion_context (rctx);