lkml.org 
[lkml]   [2009]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 01/13] [PATCH 01/13] perf tools: handle print concatinations in event format file
From: Steven Rostedt <srostedt@redhat.com>

kmem_alloc ftrace event format had a string that was broken up by
two tokens. "string 1" "string 2". This patch lets the parser be able
to handle the concatination.

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

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 6f851f9..2fee75f 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1734,6 +1734,7 @@ static int event_read_print(struct event *event)
if (read_expect_type(EVENT_DQUOTE, &token) < 0)
goto fail;

+ concat:
event->print_fmt.format = token;
event->print_fmt.args = NULL;

@@ -1743,6 +1744,21 @@ static int event_read_print(struct event *event)
if (type == EVENT_NONE)
return 0;

+ /* Handle concatination of print lines */
+ if (type == EVENT_DQUOTE) {
+ char *cat;
+
+ cat = malloc_or_die(strlen(event->print_fmt.format) +
+ strlen(token) + 1);
+ strcpy(cat, event->print_fmt.format);
+ strcat(cat, token);
+ free_token(token);
+ free_token(event->print_fmt.format);
+ event->print_fmt.format = NULL;
+ token = cat;
+ goto concat;
+ }
+
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
goto fail;

--
1.6.3.3



\
 
 \ /
  Last update: 2009-10-14 21:55    [W:0.199 / U:1.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site