lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing: clean up splice code

Browse Source 
Ingo Molnar suggested a series of clean ups for the splice code.
This patch implements those suggestions.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
This commit is contained in:
Steven Rostedt
2009-02-09 12:06:29 -05:00
parent ff98781bab
commit 34cd4998d3
1 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
kernel/trace/trace.c
View File

@@ -2546,48 +2546,12 @@ static struct pipe_buf_operations tracing_pipe_buf_ops = {
.get = generic_pipe_buf_get, .get = generic_pipe_buf_get,
}; };
static ssize_t tracing_splice_read_pipe(struct file *filp, static size_t
loff_t *ppos, tracing_fill_pipe_page(struct page *pages, size_t rem,
struct pipe_inode_info *pipe, struct trace_iterator *iter)
size_t len,
unsigned int flags)
{ {
struct page *pages[PIPE_BUFFERS]; size_t count;
struct partial_page partial[PIPE_BUFFERS]; int ret;
struct trace_iterator *iter = filp->private_data;
struct splice_pipe_desc spd = {
.pages = pages,
.partial = partial,
.nr_pages = 0, /* This gets updated below. */
.flags = flags,
.ops = &tracing_pipe_buf_ops,
.spd_release = tracing_spd_release_pipe,
};
ssize_t ret;
size_t count, rem;
unsigned int i;
mutex_lock(&trace_types_lock);
if (iter->trace->splice_read) {
ret = iter->trace->splice_read(iter, filp,
ppos, pipe, len, flags);
if (ret)
goto out;
}
ret = tracing_wait_pipe(filp);
if (ret <= 0)
goto out;
if (!iter->ent && !find_next_entry_inc(iter)) {
ret = -EFAULT;
goto out;
}
/* Fill as many pages as possible. */
for (i = 0, rem = len; i < PIPE_BUFFERS && rem; i++) {
pages[i] = alloc_page(GFP_KERNEL);
/* Seq buffer is page-sized, exactly what we need. */ /* Seq buffer is page-sized, exactly what we need. */
for (;;) { for (;;) {
@@ -2613,6 +2577,56 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
} }
} }
return rem;
}
static ssize_t tracing_splice_read_pipe(struct file *filp,
loff_t *ppos,
struct pipe_inode_info *pipe,
size_t len,
unsigned int flags)
{
struct page *pages[PIPE_BUFFERS];
struct partial_page partial[PIPE_BUFFERS];
struct trace_iterator *iter = filp->private_data;
struct splice_pipe_desc spd = {
.pages = pages,
.partial = partial,
.nr_pages = 0, /* This gets updated below. */
.flags = flags,
.ops = &tracing_pipe_buf_ops,
.spd_release = tracing_spd_release_pipe,
};
ssize_t ret;
size_t rem;
unsigned int i;
mutex_lock(&trace_types_lock);
if (iter->trace->splice_read) {
ret = iter->trace->splice_read(iter, filp,
ppos, pipe, len, flags);
if (ret)
goto out_err;
}
ret = tracing_wait_pipe(filp);
if (ret <= 0)
goto out_err;
if (!iter->ent && !find_next_entry_inc(iter)) {
ret = -EFAULT;
goto out_err;
}
/* Fill as many pages as possible. */
for (i = 0, rem = len; i < PIPE_BUFFERS && rem; i++) {
pages[i] = alloc_page(GFP_KERNEL);
if (!pages[i])
break;
rem = tracing_fill_pipe_page(pages[i], rem, iter);
/* Copy the data into the page, so we can start over. */ /* Copy the data into the page, so we can start over. */
ret = trace_seq_to_buffer(&iter->seq, ret = trace_seq_to_buffer(&iter->seq,
page_address(pages[i]), page_address(pages[i]),
@@ -2633,7 +2647,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
return splice_to_pipe(pipe, &spd); return splice_to_pipe(pipe, &spd);
out: out_err:
mutex_unlock(&trace_types_lock); mutex_unlock(&trace_types_lock);
return ret; return ret;