[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 04/11] trace: [tracetool] Simplify event line par
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v7 04/11] trace: [tracetool] Simplify event line parsing |
Date: |
Wed, 21 Mar 2012 22:52:50 +0100 |
User-agent: |
StGit/0.16 |
Using regular expressions yields more compact and error-proof code when breaking
the lines into pieces.
Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Harsh Prateek Bora <address@hidden>
---
scripts/tracetool.py | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index ff1519c..4f9060f 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -10,6 +10,7 @@
import sys
import getopt
+import re
def usage():
print "Tracetool: Generate tracing code for trace events file on stdin"
@@ -38,25 +39,14 @@ Options:
'''
sys.exit(1)
-def get_name(line, sep='('):
- head, sep, tail = line.partition(sep)
- property, sep, name = head.rpartition(' ')
- return name
-
def get_properties(line, sep='('):
head, sep, tail = line.partition(sep)
property, sep, name = head.rpartition(' ')
return property.split()
-def get_args(line, sep1='(', sep2=')'):
- head, sep1, tail = line.partition(sep1)
- args, sep2, fmt_str = tail.partition(sep2)
- return args
-
-def get_argnames(line, sep=','):
+def get_argnames(args):
nfields = 0
str = []
- args = get_args(line)
for field in args.split():
nfields = nfields + 1
# Drop pointer star
@@ -77,17 +67,6 @@ def get_argnames(line, sep=','):
else:
return ''
-def get_argc(line):
- argc = 0
- argnames = get_argnames(line)
- if argnames:
- for name in argnames.split(','):
- argc = argc + 1
- return argc
-
-def get_fmt(line, sep=')'):
- event, sep, fmt = line.partition(sep)
- return fmt.rstrip('\n')
def trace_h_begin():
print '''#ifndef TRACE_H
@@ -400,15 +379,23 @@ trace_gen = {
}
# A trace event
+cre = re.compile("(?P<name>[^(\s]+)\((?P<args>[^)]*)\)\s*(?P<fmt>\".*)?")
+
class Event(object):
def __init__(self, num, line):
self.num = num
- self.args = get_args(line)
+ m = cre.match(line)
+ assert m is not None
+ groups = m.groupdict('')
+ self.args = groups["args"]
self.arglist = self.args.split(',')
- self.name = get_name(line)
- self.argc = get_argc(line)
- self.argnames = get_argnames(line)
- self.fmt = get_fmt(line)
+ self.name = groups["name"]
+ if len(self.arglist) == 1 and self.arglist[0] == "void":
+ self.argc = 0
+ else:
+ self.argc = len(self.arglist)
+ self.argnames = get_argnames(self.args)
+ self.fmt = groups["fmt"]
self.properties = get_properties(line)
# Generator that yields Event objects given a trace-events file object
- [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 <=
- [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, 2012/03/21
- [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