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 08/13] tracing: Use seq file for trace_clock
Date: Mon, 07 Dec 2009 15:42:31 +0800 [thread overview]
Message-ID: <4B1CB1E7.2000704@cn.fujitsu.com> (raw)
In-Reply-To: <4B1CB14A.4080402@cn.fujitsu.com>
The buffer for the output is as small as 64 bytes, so it'll
overflow if we add more clock types. Use seq file instead.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index e989fc9..75871e5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3327,21 +3327,18 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
return cnt;
}
-static ssize_t tracing_clock_read(struct file *filp, char __user *ubuf,
- size_t cnt, loff_t *ppos)
+static int tracing_clock_show(struct seq_file *m, void *v)
{
- char buf[64];
- int bufiter = 0;
int i;
for (i = 0; i < ARRAY_SIZE(trace_clocks); i++)
- bufiter += snprintf(buf + bufiter, sizeof(buf) - bufiter,
+ seq_printf(m,
"%s%s%s%s", i ? " " : "",
i == trace_clock_id ? "[" : "", trace_clocks[i].name,
i == trace_clock_id ? "]" : "");
- bufiter += snprintf(buf + bufiter, sizeof(buf) - bufiter, "\n");
+ seq_putc(m, '\n');
- return simple_read_from_buffer(ubuf, cnt, ppos, buf, bufiter);
+ return 0;
}
static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
@@ -3383,6 +3380,13 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
return cnt;
}
+static int tracing_clock_open(struct inode *inode, struct file *file)
+{
+ if (tracing_disabled)
+ return -ENODEV;
+ return single_open(file, tracing_clock_show, NULL);
+}
+
static const struct file_operations tracing_max_lat_fops = {
.open = tracing_open_generic,
.read = tracing_max_lat_read,
@@ -3421,8 +3425,10 @@ static const struct file_operations tracing_mark_fops = {
};
static const struct file_operations trace_clock_fops = {
- .open = tracing_open_generic,
- .read = tracing_clock_read,
+ .open = tracing_clock_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
.write = tracing_clock_write,
};
--
1.6.3
next prev parent reply other threads:[~2009-12-07 7:42 UTC|newest]
Thread overview: 23+ 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 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Li Zefan
2009-12-07 21:32 ` 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 ` Li Zefan [this message]
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:16 ` [PATCH 08/13] tracing: Use seq file for trace_clock Li Zefan
2009-12-13 13:08 [GIT PULL] tracing updates Frederic Weisbecker
2009-12-13 13:08 ` [PATCH 08/13] tracing: Use seq file for trace_clock 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=4B1CB1E7.2000704@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