lkml.org 
[lkml]   [2009]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo()
On Mon, Dec 07, 2009 at 03:40:51PM +0800, Li Zefan wrote:
> Move the printk from each ftrace_raw_reg_event_foo() to
> its caller ftrace_event_enable_disable().
>
> See how much space this saves:
>
> text data bss dec hex filename
> 5454538 2005772 7103796 14564106 de3b0a vmlinux.o
> 5440766 2005772 7103796 14550334 de053e vmlinux.o
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
> include/trace/ftrace.h | 16 ++--------------
> kernel/trace/trace_events.c | 17 +++++++++++++----
> kernel/trace/trace_syscalls.c | 10 ++--------
> 3 files changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
> index 84d6f23..4aac981 100644
> --- a/include/trace/ftrace.h
> +++ b/include/trace/ftrace.h
> @@ -555,13 +555,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
> *
> * static int ftrace_reg_event_<call>(struct ftrace_event_call *unused)
> * {
> - * int ret;
> - *
> - * ret = register_trace_<call>(ftrace_event_<call>);
> - * if (!ret)
> - * pr_info("event trace: Could not activate trace point "
> - * "probe to <call>");
> - * return ret;
> + * return register_trace_<call>(ftrace_event_<call>);
> * }
> *
> * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
> @@ -733,13 +727,7 @@ static void ftrace_raw_event_##call(proto) \
> \
> static int ftrace_raw_reg_event_##call(struct ftrace_event_call *unused)\
> { \
> - int ret; \
> - \
> - ret = register_trace_##call(ftrace_raw_event_##call); \
> - if (ret) \
> - pr_info("event trace: Could not activate trace point " \
> - "probe to " #call "\n"); \
> - return ret; \
> + return register_trace_##call(ftrace_raw_event_##call); \
> } \
> \
> static void ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused)\
> diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
> index 9fa6736..f22eaec 100644
> --- a/kernel/trace/trace_events.c
> +++ b/kernel/trace/trace_events.c
> @@ -104,9 +104,11 @@ void trace_destroy_fields(struct ftrace_event_call *call)
> }
> }
>
> -static void ftrace_event_enable_disable(struct ftrace_event_call *call,
> +static int ftrace_event_enable_disable(struct ftrace_event_call *call,
> int enable)
> {
> + int ret = 0;
> +
> switch (enable) {
> case 0:
> if (call->enabled) {
> @@ -117,12 +119,19 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call,
> break;
> case 1:
> if (!call->enabled) {
> + if (ret) {
> + pr_info("event trace: Could not enable event "
> + "%s\n", call->name);
> + break;
> + }
> call->enabled = 1;
> tracing_start_cmdline_record();
> - call->regfunc(call);
> + ret = call->regfunc(call);



Heh, I'm pretty sure I will never see this warning ;-)



\
 
 \ /
  Last update: 2009-12-07 22:35    [W:0.091 / U:0.376 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site