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

perf tools: Handle both versions of ftrace output

Browse Source 
The ftrace output events can have either arguments or no
arguments. The parser needs to be able to handle both.

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: <20091014194359.790221427@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt
2009-10-14 15:43:41 -04:00
committed by Ingo Molnar
parent ffa1895561
commit 0d1da915c7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1819,7 +1819,7 @@ static int event_read_print(struct event *event)
if (ret < 0) if (ret < 0)
return -1; return -1;
return 0; return ret;
fail: fail:
free_token(token); free_token(token);
@@ -3088,6 +3088,9 @@ int parse_ftrace_file(char *buf, unsigned long size)
if (ret < 0) if (ret < 0)
die("failed to read ftrace event print fmt"); die("failed to read ftrace event print fmt");
/* New ftrace handles args */
if (ret > 0)
return 0;
/* /*
* The arguments for ftrace files are parsed by the fields. * The arguments for ftrace files are parsed by the fields.
* Set up the fields as their arguments. * Set up the fields as their arguments.