Commit 0883d9d7 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Have bprintk output the same as the kernel does

The trace_bprintk() in the kernel looks like:

 ring_buffer_producer_thread: Missed:   0
 ring_buffer_producer_thread: Hit:      62174350
 ring_buffer_producer_thread: Entries per millisec: 6296
 ring_buffer_producer_thread: 158 ns per entry
 ring_buffer_producer_thread: Sleeping for 10 secs
 ring_buffer_producer_thread: Starting ring buffer hammer
 ring_buffer_producer_thread: End ring buffer hammer

But the current output looks like this:

 ring_buffer_producer_thread : Time:     9407018 (usecs)
 ring_buffer_producer_thread : Overruns: 43285485
 ring_buffer_producer_thread : Read:     4405365  (by events)
 ring_buffer_producer_thread : Entries:  0
 ring_buffer_producer_thread : Total:    47690850
 ring_buffer_producer_thread : Missed:   0
 ring_buffer_producer_thread : Hit:      47690850

Remove the space between the function and the colon.
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20131101215501.272654481@goodmis.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b30f75eb
...@@ -3802,8 +3802,8 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc ...@@ -3802,8 +3802,8 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
if (asprintf(&arg->atom.atom, "%lld", ip) < 0) if (asprintf(&arg->atom.atom, "%lld", ip) < 0)
goto out_free; goto out_free;
/* skip the first "%pf : " */ /* skip the first "%pf: " */
for (ptr = fmt + 6, bptr = data + field->offset; for (ptr = fmt + 5, bptr = data + field->offset;
bptr < data + size && *ptr; ptr++) { bptr < data + size && *ptr; ptr++) {
int ls = 0; int ls = 0;
...@@ -3929,12 +3929,12 @@ get_bprint_format(void *data, int size __maybe_unused, ...@@ -3929,12 +3929,12 @@ get_bprint_format(void *data, int size __maybe_unused,
printk = find_printk(pevent, addr); printk = find_printk(pevent, addr);
if (!printk) { if (!printk) {
if (asprintf(&format, "%%pf : (NO FORMAT FOUND at %llx)\n", addr) < 0) if (asprintf(&format, "%%pf: (NO FORMAT FOUND at %llx)\n", addr) < 0)
return NULL; return NULL;
return format; return format;
} }
if (asprintf(&format, "%s : %s", "%pf", printk->printk) < 0) if (asprintf(&format, "%s: %s", "%pf", printk->printk) < 0)
return NULL; return NULL;
return format; return format;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment