From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934070AbbENPXM (ORCPT ); Thu, 14 May 2015 11:23:12 -0400 Received: from mail.kernel.org ([198.145.29.136]:41212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933465AbbENPT0 (ORCPT ); Thu, 14 May 2015 11:19:26 -0400 Message-Id: <20150514151920.173362299@goodmis.org> User-Agent: quilt/0.61-1 Date: Thu, 14 May 2015 11:13:29 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Peter Zijlstra , Namhyung Kim , Masami Hiramatsu , Arnaldo Carvalho de Melo , Jiri Olsa , Daniel Wagner Subject: [RFC][PATCH 14/19] tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled() References: <20150514151315.746637810@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0014-tracing-Rename-ftrace_trigger_soft_disabled-to-trace.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (Red Hat)" 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 --- include/linux/trace_events.h | 4 ++-- include/trace/perf.h | 2 +- kernel/trace/trace_kprobe.c | 4 ++-- kernel/trace/trace_syscalls.c | 4 ++-- kernel/trace/trace_uprobe.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index a46c138b2eea..1063c850dbab 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -426,7 +426,7 @@ extern void event_triggers_post_call(struct trace_event_file *file, 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 * * 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. */ 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; diff --git a/include/trace/perf.h b/include/trace/perf.h index 792eca92c43a..c9b831f3da23 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -159,7 +159,7 @@ ftrace_raw_event_##call(void *__data, proto) \ struct ftrace_raw_##call *entry; \ int __data_size; \ \ - if (ftrace_trigger_soft_disabled(trace_file)) \ + if (trace_trigger_soft_disabled(trace_file)) \ return; \ \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 4ce865dae39e..b7d0cdd9906c 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -928,7 +928,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, WARN_ON(call != trace_file->event_call); - if (ftrace_trigger_soft_disabled(trace_file)) + if (trace_trigger_soft_disabled(trace_file)) return; 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); - if (ftrace_trigger_soft_disabled(trace_file)) + if (trace_trigger_soft_disabled(trace_file)) return; local_save_flags(irq_flags); diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 504f582b15db..7d567a4b9fa7 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -312,7 +312,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) if (!trace_file) return; - if (ftrace_trigger_soft_disabled(trace_file)) + if (trace_trigger_soft_disabled(trace_file)) return; 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) return; - if (ftrace_trigger_soft_disabled(trace_file)) + if (trace_trigger_soft_disabled(trace_file)) return; sys_data = syscall_nr_to_meta(syscall_nr); diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 40764abc7d09..aa1ea7b36fa8 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -784,7 +784,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu, if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE)) return; - if (ftrace_trigger_soft_disabled(trace_file)) + if (trace_trigger_soft_disabled(trace_file)) return; esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); -- 2.1.4