Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu> --- scripts/tracetool.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 67a2f23..e35eb68 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -472,7 +472,9 @@ trace_gen = { # A trace event import re -cre = re.compile("(?P<name>[^(\s]+)\((?P<args>[^)]*)\)\s*(?P<fmt>\".*)?") +cre = re.compile("((?P<props>.*)\s+)?(?P<name>[^(\s]+)\((?P<args>[^)]*)\)\s*(?P<fmt>\".*)?") + +VALID_PROPS = set(["disable"]) class Event(object): def __init__(self, line): @@ -491,6 +493,10 @@ class Event(object): self.argnames = get_argnames(self.args) self.sizestr = calc_sizeofargs(self.args, self.argc) self.fmt = groups["fmt"] + self.properties = groups["props"].split() + unknown_props = set(self.properties) - VALID_PROPS + if len(unknown_props) > 0: + raise ValueError("Unknown properties: %s" % ", ".join(unknown_props)) # Generator that yields Event objects given a trace-events file object def read_events(fobj):