Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf tools: Fix backslash processing on trace print formats

Browse Source 
The handling of backslashes was broken. It would stop parsing
when encountering one. Also, '\n', '\t', '\r' and '\\' were not
converted.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <20091014194357.521974680@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt 2009-10-14 15:43:33 -04:00 committed by Ingo Molnar
parent 924a79af2c
commit 91ff2bc191
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/perf/util/trace-event-parse.c
View File

@ -522,7 +522,10 @@ static enum event_type __read_token(char **tok)
last_ch = ch; last_ch = ch;
ch = __read_char(); ch = __read_char();
buf[i++] = ch; buf[i++] = ch;
} while (ch != quote_ch && last_ch != '\\'); /* the '\' '\' will cancel itself */
if (ch == '\\' && last_ch == '\\')
last_ch = 0;
} while (ch != quote_ch || last_ch == '\\');
/* remove the last quote */ /* remove the last quote */
i--; i--;
goto out; goto out;
@ -2325,7 +2328,27 @@ static void pretty_print(void *data, int size, struct event *event)
for (; *ptr; ptr++) { for (; *ptr; ptr++) {
ls = 0; ls = 0;
if (*ptr == '%') { if (*ptr == '\\') {
ptr++;
switch (*ptr) {
case 'n':
printf("\n");
break;
case 't':
printf("\t");
break;
case 'r':
printf("\r");
break;
case '\\':
printf("\\");
break;
default:
printf("%c", *ptr);
break;
}
} else if (*ptr == '%') {
saveptr = ptr; saveptr = ptr;
show_func = 0; show_func = 0;
cont_process: cont_process: