[PATCH 3/6] tracing: tracing_stats_read() uses simple buffer insteadof trace_seq

From: Lai Jiangshan
Date: Tue Jan 19 2010 - 02:35:45 EST



It seems that struct trace_seq is too heavy for tracing_stats_read().
we use simple buffer instead of struct trace_seq.

Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
---
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 27fecf8..aa1cd92 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3807,27 +3807,22 @@ tracing_stats_read(struct file *filp, char __user *ubuf,
{
unsigned long cpu = (unsigned long)filp->private_data;
struct trace_array *tr = &global_trace;
- struct trace_seq *s;
unsigned long cnt;

- s = kmalloc(sizeof(*s), GFP_KERNEL);
- if (!s)
- return -ENOMEM;
-
- trace_seq_init(s);
+ unsigned char buf[128];
+ int len = 0;

cnt = ring_buffer_entries_cpu(tr->buffer, cpu);
- trace_seq_printf(s, "entries: %ld\n", cnt);
+ len += sprintf(buf + len, "entries: %ld\n", cnt);

cnt = ring_buffer_overrun_cpu(tr->buffer, cpu);
- trace_seq_printf(s, "overrun: %ld\n", cnt);
+ len += sprintf(buf + len, "overrun: %ld\n", cnt);

cnt = ring_buffer_commit_overrun_cpu(tr->buffer, cpu);
- trace_seq_printf(s, "commit overrun: %ld\n", cnt);
-
- count = simple_read_from_buffer(ubuf, count, ppos, s->buffer, s->len);
+ len += sprintf(buf + len, "commit overrun: %ld\n", cnt);

- kfree(s);
+ BUG_ON(len >= sizeof(buf)); /* should not happen, 128 is enough. */
+ count = simple_read_from_buffer(ubuf, count, ppos, buf, len);

return count;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/