leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftrace: Add ops parameter to ftrace_startup/shutdown functions

Browse Source 
In order to allow different ops to enable different functions,
the ftrace_startup() and ftrace_shutdown() functions need the
ops parameter passed to them.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2011-05-03 21:55:54 -04:00 committed by Steven Rostedt
parent 647bcd03d5
commit bd69c30b1d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/trace/ftrace.c
View File

@ -1522,10 +1522,8 @@ static void ftrace_startup_enable(int command)
ftrace_run_update_code(command); ftrace_run_update_code(command);
} }
static void ftrace_startup(int command) static void ftrace_startup(struct ftrace_ops *ops, int command)
{ {
struct ftrace_ops *ops = &global_ops;
if (unlikely(ftrace_disabled)) if (unlikely(ftrace_disabled))
return; return;
@ -1539,10 +1537,8 @@ static void ftrace_startup(int command)
ftrace_startup_enable(command); ftrace_startup_enable(command);
} }
static void ftrace_shutdown(int command) static void ftrace_shutdown(struct ftrace_ops *ops, int command)
{ {
struct ftrace_ops *ops = &global_ops;
if (unlikely(ftrace_disabled)) if (unlikely(ftrace_disabled))
return; return;
@ -2362,7 +2358,7 @@ static void __enable_ftrace_function_probe(void)
return; return;
__register_ftrace_function(&trace_probe_ops); __register_ftrace_function(&trace_probe_ops);
ftrace_startup(0); ftrace_startup(&global_ops, 0);
ftrace_probe_registered = 1; ftrace_probe_registered = 1;
} }
@ -2381,7 +2377,7 @@ static void __disable_ftrace_function_probe(void)
/* no more funcs left */ /* no more funcs left */
__unregister_ftrace_function(&trace_probe_ops); __unregister_ftrace_function(&trace_probe_ops);
ftrace_shutdown(0); ftrace_shutdown(&global_ops, 0);
ftrace_probe_registered = 0; ftrace_probe_registered = 0;
} }
@ -3267,6 +3263,10 @@ void __init ftrace_init(void)
#else #else
struct ftrace_ops global_ops = {
.func = ftrace_stub,
};
static int __init ftrace_nodyn_init(void) static int __init ftrace_nodyn_init(void)
{ {
ftrace_enabled = 1; ftrace_enabled = 1;
@ -3277,8 +3277,8 @@ device_initcall(ftrace_nodyn_init);
static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; } static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; }
static inline void ftrace_startup_enable(int command) { } static inline void ftrace_startup_enable(int command) { }
/* Keep as macros so we do not need to define the commands */ /* Keep as macros so we do not need to define the commands */
# define ftrace_startup(command) do { } while (0) # define ftrace_startup(ops, command) do { } while (0)
# define ftrace_shutdown(command) do { } while (0) # define ftrace_shutdown(ops, command) do { } while (0)
# define ftrace_startup_sysctl() do { } while (0) # define ftrace_startup_sysctl() do { } while (0)
# define ftrace_shutdown_sysctl() do { } while (0) # define ftrace_shutdown_sysctl() do { } while (0)
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
@ -3583,7 +3583,7 @@ int register_ftrace_function(struct ftrace_ops *ops)
goto out_unlock; goto out_unlock;
ret = __register_ftrace_function(ops); ret = __register_ftrace_function(ops);
ftrace_startup(0); ftrace_startup(&global_ops, 0);
out_unlock: out_unlock:
mutex_unlock(&ftrace_lock); mutex_unlock(&ftrace_lock);
@ -3602,7 +3602,7 @@ int unregister_ftrace_function(struct ftrace_ops *ops)
mutex_lock(&ftrace_lock); mutex_lock(&ftrace_lock);
ret = __unregister_ftrace_function(ops); ret = __unregister_ftrace_function(ops);
ftrace_shutdown(0); ftrace_shutdown(&global_ops, 0);
mutex_unlock(&ftrace_lock); mutex_unlock(&ftrace_lock);
return ret; return ret;
@ -3825,7 +3825,7 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
ftrace_graph_return = retfunc; ftrace_graph_return = retfunc;
ftrace_graph_entry = entryfunc; ftrace_graph_entry = entryfunc;
ftrace_startup(FTRACE_START_FUNC_RET); ftrace_startup(&global_ops, FTRACE_START_FUNC_RET);
out: out:
mutex_unlock(&ftrace_lock); mutex_unlock(&ftrace_lock);
@ -3842,7 +3842,7 @@ void unregister_ftrace_graph(void)
ftrace_graph_active--; ftrace_graph_active--;
ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub; ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub;
ftrace_graph_entry = ftrace_graph_entry_stub; ftrace_graph_entry = ftrace_graph_entry_stub;
ftrace_shutdown(FTRACE_STOP_FUNC_RET); ftrace_shutdown(&global_ops, FTRACE_STOP_FUNC_RET);
unregister_pm_notifier(&ftrace_suspend_notifier); unregister_pm_notifier(&ftrace_suspend_notifier);
unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, NULL); unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, NULL);