public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
	Andrew Morton <akpm@linux-foundation.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 06/13] [PATCH 06/13] perf tools: handle newlines in trace parsing better
Date: Wed, 14 Oct 2009 15:43:37 -0400	[thread overview]
Message-ID: <20091014194358.637991808@goodmis.org> (raw)
In-Reply-To: 20091014194330.980165492@goodmis.org

[-- Attachment #1: 0006-perf-tools-handle-newlines-in-trace-parsing-better.patch --]
[-- Type: text/plain, Size: 998 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

New lines between args in the trace format can break the parsing.
This should not be the case.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 tools/perf/util/trace-event-parse.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index d8c86f1..5dba81d 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1716,12 +1716,18 @@ process_arg_token(struct event *event, struct print_arg *arg,
 
 static int event_read_print_args(struct event *event, struct print_arg **list)
 {
-	enum event_type type;
+	enum event_type type = EVENT_ERROR;
 	struct print_arg *arg;
 	char *token;
 	int args = 0;
 
 	do {
+		if (type == EVENT_NEWLINE) {
+			free_token(token);
+			type = read_token_item(&token);
+			continue;
+		}
+
 		arg = malloc_or_die(sizeof(*arg));
 		memset(arg, 0, sizeof(*arg));
 
-- 
1.6.3.3



  parent reply	other threads:[~2009-10-14 19:47 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-14 19:43 [PATCH 00/13] [GIT PULL] perf tools: updates to parsing events Steven Rostedt
2009-10-14 19:43 ` [PATCH 01/13] [PATCH 01/13] perf tools: handle print concatinations in event format file Steven Rostedt
2009-10-15  8:48   ` [tip:perf/core] perf tools: Handle print concatenations " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 02/13] [PATCH 02/13] perf tools: fix backslash processing on trace print formats Steven Rostedt
2009-10-15  8:48   ` [tip:perf/core] perf tools: Fix " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 03/13] [PATCH 03/13] perf tools: handle trace parsing of < and > Steven Rostedt
2009-10-15  8:48   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 04/13] [PATCH 04/13] perf tools: handle arrays in print fields for trace parsing Steven Rostedt
2009-10-15  8:48   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 05/13] [PATCH 05/13] perf tools: handle * as typecast in " Steven Rostedt
2009-10-15  8:49   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` Steven Rostedt [this message]
2009-10-15  8:49   ` [tip:perf/core] perf tools: Handle newlines in trace parsing better tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 07/13] [PATCH 07/13] perf tools: handle the case with and without the "signed" trace field Steven Rostedt
2009-10-15  8:49   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 08/13] [PATCH 08/13] perf tools: still continue on failed parsing of an event Steven Rostedt
2009-10-15  8:49   ` [tip:perf/core] perf tools: Still " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 09/13] [PATCH 09/13] perf tools: fix bprintk reading in trace output Steven Rostedt
2009-10-15  8:50   ` [tip:perf/core] perf tools: Fix " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 10/13] [PATCH 10/13] perf tools: handle both versions of ftrace output Steven Rostedt
2009-10-15  8:50   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 11/13] [PATCH 11/13] perf tools: add latency format to trace output Steven Rostedt
2009-10-15  8:50   ` [tip:perf/core] perf tools: Add " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 12/13] [PATCH 12/13] perf tools: handle - and + in parsing trace print format Steven Rostedt
2009-10-15  6:42   ` Ingo Molnar
2009-10-15  7:05     ` Peter Zijlstra
2009-10-15  9:20       ` Steven Rostedt
2009-10-15  8:50   ` [tip:perf/core] perf tools: Handle " tip-bot for Steven Rostedt
2009-10-14 19:43 ` [PATCH 13/13] [PATCH 13/13] perf tools: remove all char * typecasts and use const in prototype Steven Rostedt
2009-10-14 20:26   ` Frederic Weisbecker
2009-10-15  8:51   ` [tip:perf/core] perf tools: Remove " tip-bot for Steven Rostedt
2009-10-15  8:55 ` [PATCH 00/13] [GIT PULL] perf tools: updates to parsing events Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2009-10-20 23:19 [PATCH 0/2] [GIT PULL] perf tools: trace parse fix and debug compiling Steven Rostedt
2009-10-20 23:19 ` [PATCH 1/2] [PATCH 1/2] perf tools: add make DEBUG=1 to remove the -O6 cflag Steven Rostedt
2009-10-24  1:03   ` [tip:branch?] perf tools: Add 'make DEBUG=1' " tip-bot for Steven Rostedt
2009-10-20 23:19 ` [PATCH 2/2] [PATCH 2/2] perf tools: use strsep over strtok_r for parsing single line Steven Rostedt
2009-10-24  1:03   ` [tip:branch?] perf tools: Use strsep() over strtok_r() " tip-bot for Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091014194358.637991808@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=acme@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=srostedt@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox