diff options
author | Steven Rostedt <srostedt@redhat.com> | 2010-05-18 11:04:30 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-18 11:04:30 -0400 |
commit | 26a64b58674a53e1299c5af9b090bbce0eb2f1f8 (patch) | |
tree | 62eff93b1b792cb7c8b88140e689282d5331cddf | |
parent | 7f16dcb25f80f09978c762e23aca70882397ab05 (diff) |
trace-cmd: Fix reading of print strings
The code that cleaned up parsing the printk_format file never registered
the formats to the pevent code. Any trace_printk() that used bprint()
was not able to be parsed.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | trace-cmd.h | 2 | ||||
-rw-r--r-- | trace-input.c | 2 | ||||
-rw-r--r-- | trace-util.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/trace-cmd.h b/trace-cmd.h index cc11cdf..643d394 100644 --- a/trace-cmd.h +++ b/trace-cmd.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | void parse_cmdlines(struct pevent *pevent, char *file, int size); | 27 | void parse_cmdlines(struct pevent *pevent, char *file, int size); |
28 | void parse_proc_kallsyms(struct pevent *pevent, char *file, unsigned int size); | 28 | void parse_proc_kallsyms(struct pevent *pevent, char *file, unsigned int size); |
29 | void parse_ftrace_printk(char *file, unsigned int size); | 29 | void parse_ftrace_printk(struct pevent *pevent, char *file, unsigned int size); |
30 | 30 | ||
31 | extern int tracecmd_disable_sys_plugins; | 31 | extern int tracecmd_disable_sys_plugins; |
32 | extern int tracecmd_disable_plugins; | 32 | extern int tracecmd_disable_plugins; |
diff --git a/trace-input.c b/trace-input.c index 9b0e509..c39004a 100644 --- a/trace-input.c +++ b/trace-input.c | |||
@@ -440,7 +440,7 @@ static int read_ftrace_printk(struct tracecmd_input *handle) | |||
440 | return -1; | 440 | return -1; |
441 | } | 441 | } |
442 | 442 | ||
443 | parse_ftrace_printk(buf, size); | 443 | parse_ftrace_printk(handle->pevent, buf, size); |
444 | 444 | ||
445 | free(buf); | 445 | free(buf); |
446 | 446 | ||
diff --git a/trace-util.c b/trace-util.c index 0397732..de2cb28 100644 --- a/trace-util.c +++ b/trace-util.c | |||
@@ -104,7 +104,8 @@ void parse_proc_kallsyms(struct pevent *pevent, | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | void parse_ftrace_printk(char *file, unsigned int size __unused) | 107 | void parse_ftrace_printk(struct pevent *pevent, |
108 | char *file, unsigned int size __unused) | ||
108 | { | 109 | { |
109 | unsigned long long addr; | 110 | unsigned long long addr; |
110 | char *printk; | 111 | char *printk; |
@@ -124,6 +125,7 @@ void parse_ftrace_printk(char *file, unsigned int size __unused) | |||
124 | /* fmt still has a space, skip it */ | 125 | /* fmt still has a space, skip it */ |
125 | printk = strdup(fmt+1); | 126 | printk = strdup(fmt+1); |
126 | line = strtok_r(NULL, "\n", &next); | 127 | line = strtok_r(NULL, "\n", &next); |
128 | pevent_register_print_string(pevent, printk, addr); | ||
127 | } | 129 | } |
128 | } | 130 | } |
129 | 131 | ||