From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo()
Date: Mon, 07 Dec 2009 15:40:51 +0800 [thread overview]
Message-ID: <4B1CB183.7040202@cn.fujitsu.com> (raw)
In-Reply-To: <4B1CB14A.4080402@cn.fujitsu.com>
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);
}
break;
}
+
+ return ret;
}
static void ftrace_clear_events(void)
@@ -401,7 +410,7 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
case 0:
case 1:
mutex_lock(&event_mutex);
- ftrace_event_enable_disable(call, val);
+ ret = ftrace_event_enable_disable(call, val);
mutex_unlock(&event_mutex);
break;
@@ -411,7 +420,7 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
*ppos += cnt;
- return cnt;
+ return ret ? ret : cnt;
}
static ssize_t
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index b957edd..75289f3 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -325,10 +325,7 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
mutex_lock(&syscall_trace_lock);
if (!sys_refcount_enter)
ret = register_trace_sys_enter(ftrace_syscall_enter);
- if (ret) {
- pr_info("event trace: Could not activate"
- "syscall entry trace point");
- } else {
+ if (!ret) {
set_bit(num, enabled_enter_syscalls);
sys_refcount_enter++;
}
@@ -362,10 +359,7 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
mutex_lock(&syscall_trace_lock);
if (!sys_refcount_exit)
ret = register_trace_sys_exit(ftrace_syscall_exit);
- if (ret) {
- pr_info("event trace: Could not activate"
- "syscall exit trace point");
- } else {
+ if (!ret) {
set_bit(num, enabled_exit_syscalls);
sys_refcount_exit++;
}
--
1.6.3
next prev parent reply other threads:[~2009-12-07 7:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-07 7:39 [PATCH 0/13] tracing: various cleanups and small fixes Li Zefan
2009-12-07 7:40 ` [PATCH 01/13] tracing: Extract duplicate ftrace_raw_init_event_foo() Li Zefan
2009-12-07 14:27 ` Frederic Weisbecker
2009-12-08 0:54 ` Li Zefan
2009-12-07 7:40 ` [PATCH 02/13] tracing: Extract calls to trace_define_common_fields() Li Zefan
2009-12-07 20:39 ` Frederic Weisbecker
2009-12-07 7:40 ` Li Zefan [this message]
2009-12-07 21:32 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Frederic Weisbecker
2009-12-08 1:00 ` Li Zefan
2009-12-07 7:41 ` [PATCH 04/13] ftrace: Return EINVAL when writing invalid val to set_ftrace_filter Li Zefan
2009-12-07 7:41 ` [PATCH 05/13] ftrace: Call trace_parser_clear() properly Li Zefan
2009-12-07 7:41 ` [PATCH 06/13] function-graph: Allow writing the same val to set_graph_function Li Zefan
2009-12-07 14:43 ` Frederic Weisbecker
2009-12-07 7:42 ` [PATCH 07/13] tracing: Use seq file for trace_options Li Zefan
2009-12-07 7:42 ` [PATCH 08/13] tracing: Use seq file for trace_clock Li Zefan
2009-12-07 7:42 ` [PATCH 09/13] tracing: Remove useless trace option Li Zefan
2009-12-07 7:43 ` [PATCH 10/13] tracing: Simplify trace_option_write() Li Zefan
2009-12-07 7:43 ` [PATCH 11/13] tracing: Change event->profile_count to be int type Li Zefan
2009-12-07 7:44 ` [PATCH 12/13] tracing/power: Remove two exports Li Zefan
2009-12-07 15:02 ` Arjan van de Ven
2009-12-07 7:45 ` [PATCH 13/13] ksym_tracer: Fix compile warnings Li Zefan
-- strict thread matches above, loose matches on Subject: below --
2009-12-08 3:13 [PATCH 00/13] tracing: various cleanups and small fixes (updated) Li Zefan
2009-12-08 3:14 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Li Zefan
2009-12-08 7:43 ` Frederic Weisbecker
2009-12-08 7:49 ` Li Zefan
2009-12-08 8:11 ` Frederic Weisbecker
2009-12-13 13:08 [GIT PULL] tracing updates Frederic Weisbecker
2009-12-13 13:08 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B1CB183.7040202@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox