diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2008-11-25 15:07:04 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-25 19:59:45 -0500 |
commit | fb52607afcd0629776f1dc9e657647ceae81dd50 (patch) | |
tree | 7bf43b41ff8510d3098c089913cce56a9049f0fd /kernel/trace/trace.c | |
parent | 509dceef6470442d8c7b8a43ec34125205840b3c (diff) |
tracing/function-return-tracer: change the name into function-graph-tracer
Impact: cleanup
This patch changes the name of the "return function tracer" into
function-graph-tracer which is a more suitable name for a tracing
which makes one able to retrieve the ordered call stack during
the code flow.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8df8fdd69c95..f21ab2c68fd4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -878,15 +878,15 @@ trace_function(struct trace_array *tr, struct trace_array_cpu *data, | |||
878 | ring_buffer_unlock_commit(tr->buffer, event, irq_flags); | 878 | ring_buffer_unlock_commit(tr->buffer, event, irq_flags); |
879 | } | 879 | } |
880 | 880 | ||
881 | #ifdef CONFIG_FUNCTION_RET_TRACER | 881 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
882 | static void __trace_function_return(struct trace_array *tr, | 882 | static void __trace_function_graph(struct trace_array *tr, |
883 | struct trace_array_cpu *data, | 883 | struct trace_array_cpu *data, |
884 | struct ftrace_retfunc *trace, | 884 | struct ftrace_graph_ret *trace, |
885 | unsigned long flags, | 885 | unsigned long flags, |
886 | int pc) | 886 | int pc) |
887 | { | 887 | { |
888 | struct ring_buffer_event *event; | 888 | struct ring_buffer_event *event; |
889 | struct ftrace_ret_entry *entry; | 889 | struct ftrace_graph_entry *entry; |
890 | unsigned long irq_flags; | 890 | unsigned long irq_flags; |
891 | 891 | ||
892 | if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled)))) | 892 | if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled)))) |
@@ -1177,8 +1177,8 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) | |||
1177 | local_irq_restore(flags); | 1177 | local_irq_restore(flags); |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | #ifdef CONFIG_FUNCTION_RET_TRACER | 1180 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
1181 | void trace_function_return(struct ftrace_retfunc *trace) | 1181 | void trace_function_graph(struct ftrace_graph_ret *trace) |
1182 | { | 1182 | { |
1183 | struct trace_array *tr = &global_trace; | 1183 | struct trace_array *tr = &global_trace; |
1184 | struct trace_array_cpu *data; | 1184 | struct trace_array_cpu *data; |
@@ -1193,12 +1193,12 @@ void trace_function_return(struct ftrace_retfunc *trace) | |||
1193 | disabled = atomic_inc_return(&data->disabled); | 1193 | disabled = atomic_inc_return(&data->disabled); |
1194 | if (likely(disabled == 1)) { | 1194 | if (likely(disabled == 1)) { |
1195 | pc = preempt_count(); | 1195 | pc = preempt_count(); |
1196 | __trace_function_return(tr, data, trace, flags, pc); | 1196 | __trace_function_graph(tr, data, trace, flags, pc); |
1197 | } | 1197 | } |
1198 | atomic_dec(&data->disabled); | 1198 | atomic_dec(&data->disabled); |
1199 | raw_local_irq_restore(flags); | 1199 | raw_local_irq_restore(flags); |
1200 | } | 1200 | } |
1201 | #endif /* CONFIG_FUNCTION_RET_TRACER */ | 1201 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ |
1202 | 1202 | ||
1203 | static struct ftrace_ops trace_ops __read_mostly = | 1203 | static struct ftrace_ops trace_ops __read_mostly = |
1204 | { | 1204 | { |
@@ -2001,7 +2001,7 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter) | |||
2001 | break; | 2001 | break; |
2002 | } | 2002 | } |
2003 | case TRACE_FN_RET: { | 2003 | case TRACE_FN_RET: { |
2004 | return print_return_function(iter); | 2004 | return print_graph_function(iter); |
2005 | break; | 2005 | break; |
2006 | } | 2006 | } |
2007 | case TRACE_BRANCH: { | 2007 | case TRACE_BRANCH: { |