[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 06/11] trace: [tracetool] Add support for event p
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v7 06/11] trace: [tracetool] Add support for event properties |
Date: |
Wed, 21 Mar 2012 22:53:01 +0100 |
User-agent: |
StGit/0.16 |
Using regular expressions yields more compact and error-proof code when breaking
the event properties into pieces.
Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Harsh Prateek Bora <address@hidden>
---
scripts/tracetool.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index c2d5c24..27d1db4 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -39,11 +39,6 @@ Options:
'''
sys.exit(1)
-def get_properties(line, sep='('):
- head, sep, tail = line.partition(sep)
- property, sep, name = head.rpartition(' ')
- return property.split()
-
def get_argnames(args):
nfields = 0
str = []
@@ -379,7 +374,9 @@ trace_gen = {
}
# A trace event
-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):
@@ -395,7 +392,10 @@ class Event(object):
self.argc = len(self.arglist)
self.argnames = get_argnames(self.args)
self.fmt = groups["fmt"]
- self.properties = get_properties(line)
+ 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):
- [Qemu-devel] [PATCH v7 00/11] Rewrite tracetool using python, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 01/11] Converting tracetool.sh to tracetool.py, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 02/11] trace: [tracetool] Remove unused 'sizestr' attribute in 'Event', Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 03/11] trace: [tracetool] Do not rebuild event list in backend code, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 04/11] trace: [tracetool] Simplify event line parsing, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 05/11] trace: [tracetool] Do not precompute the event number, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 06/11] trace: [tracetool] Add support for event properties,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v7 08/11] trace: [tracetool] Rewrite event argument parsing, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 10/11] trace: Provide a per-event status define for conditional compilation, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 07/11] trace: [tracetool] Process the "disable" event property, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 09/11] trace: [tracetool] Make format-specific code optional and with access to events, Lluís Vilanova, 2012/03/21
- [Qemu-devel] [PATCH v7 11/11] trace: [tracetool] Add error-reporting functions, Lluís Vilanova, 2012/03/21