aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-11-04 16:32:25 -0400
committerBrad Figg <brad.figg@canonical.com>2012-01-23 18:36:30 -0500
commitc2b6406f9674c277b15f0cce3c05332918902f7b (patch)
treede4e0adca10741825c5ecc06f28ed29558e1b6f4 /tools/perf/util
parent5cba3115fc4245aec18c1f7fbe449be2d51bffdc (diff)
perf: Fix parsing of __print_flags() in TP_printk()
BugLink: http://bugs.launchpad.net/bugs/915926 commit 49908a1b25d448d68fd26faca260e1850201575f upstream. A update is made to the sched:sched_switch event that adds some logic to the first parameter of the __print_flags() that shows the state of tasks. This change cause perf to fail parsing the flags. A simple fix is needed to have the parser be able to process ops within the argument. Reported-by: Andrew Vagin <avagin@openvz.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Brad Figg <brad.figg@canonical.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/trace-event-parse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 6c164dc9ee9..bf54c48871d 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1582,6 +1582,8 @@ process_symbols(struct event *event, struct print_arg *arg, char **tok)
1582 field = malloc_or_die(sizeof(*field)); 1582 field = malloc_or_die(sizeof(*field));
1583 1583
1584 type = process_arg(event, field, &token); 1584 type = process_arg(event, field, &token);
1585 while (type == EVENT_OP)
1586 type = process_op(event, field, &token);
1585 if (test_type_token(type, token, EVENT_DELIM, ",")) 1587 if (test_type_token(type, token, EVENT_DELIM, ","))
1586 goto out_free; 1588 goto out_free;
1587 1589