[PATCH 10/13] [PATCH 10/13] perf tools: handle both versions of ftrace output

[Steven Rostedt <rostedt@goodmis.org>]

[-- Attachment #1: 0010-perf-tools-handle-both-versions-of-ftrace-output.patch --]
[-- Type: text/plain, Size: 999 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

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>
---
 tools/perf/util/trace-event-parse.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 5f64644..6c3cb0a 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1819,7 +1819,7 @@ static int event_read_print(struct event *event)
 	if (ret < 0)
 		return -1;
 
-	return 0;
+	return ret;
 
  fail:
 	free_token(token);
@@ -3088,6 +3088,9 @@ int parse_ftrace_file(char *buf, unsigned long size)
 	if (ret < 0)
 		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.
 	 * Set up the fields as their arguments.
-- 
1.6.3.3