evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()

Browse source 
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_trigger_soft_disabled() tests if a
trace_event is soft disabled (called but not traced), and returns true if
it is. It has nothing to do with function tracing and should be renamed.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2015-05-13 15:21:25 -04:00 • committed by Steven Rostedt
parent 5d6ad960a7
commit 09a5059aa1
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/trace_events.h
View file

@ -426,7 +426,7 @@ extern void event_triggers_post_call(struct trace_event_file *file,
enum event_trigger_type tt); enum event_trigger_type tt);
/** /**
* ftrace_trigger_soft_disabled - do triggers and test if soft disabled * trace_trigger_soft_disabled - do triggers and test if soft disabled
* @file: The file pointer of the event to test * @file: The file pointer of the event to test
* *
* If any triggers without filters are attached to this event, they * If any triggers without filters are attached to this event, they
@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct trace_event_file *file,
* otherwise false. * otherwise false.
*/ */
static inline bool static inline bool
ftrace_trigger_soft_disabled(struct trace_event_file *file) trace_trigger_soft_disabled(struct trace_event_file *file)
{ {
unsigned long eflags = file->flags; unsigned long eflags = file->flags;

2
include/trace/perf.h
View file

@ -159,7 +159,7 @@ ftrace_raw_event_##call(void *__data, proto) \
struct ftrace_raw_##call *entry; \ struct ftrace_raw_##call *entry; \
int __data_size; \ int __data_size; \
\ \
if (ftrace_trigger_soft_disabled(trace_file)) \ if (trace_trigger_soft_disabled(trace_file)) \
return; \ return; \
\ \
__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

4
kernel/trace/trace_kprobe.c
View file

@ -928,7 +928,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
WARN_ON(call != trace_file->event_call); WARN_ON(call != trace_file->event_call);
if (ftrace_trigger_soft_disabled(trace_file)) if (trace_trigger_soft_disabled(trace_file))
return; return;
local_save_flags(irq_flags); local_save_flags(irq_flags);
@ -976,7 +976,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
WARN_ON(call != trace_file->event_call); WARN_ON(call != trace_file->event_call);
if (ftrace_trigger_soft_disabled(trace_file)) if (trace_trigger_soft_disabled(trace_file))
return; return;
local_save_flags(irq_flags); local_save_flags(irq_flags);

4
kernel/trace/trace_syscalls.c
View file

@ -312,7 +312,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
if (!trace_file) if (!trace_file)
return; return;
if (ftrace_trigger_soft_disabled(trace_file)) if (trace_trigger_soft_disabled(trace_file))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);
@ -359,7 +359,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
if (!trace_file) if (!trace_file)
return; return;
if (ftrace_trigger_soft_disabled(trace_file)) if (trace_trigger_soft_disabled(trace_file))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);

2
kernel/trace/trace_uprobe.c
View file

@ -784,7 +784,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE)) if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
return; return;
if (ftrace_trigger_soft_disabled(trace_file)) if (trace_trigger_soft_disabled(trace_file))
return; return;
esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));