From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxh8L-0003SP-KM for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rxh8H-0005iK-4b for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:51:05 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:40769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxh41-0004fX-Cc for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:46:38 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Feb 2012 21:16:31 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q1FFkRFt3715250 for ; Wed, 15 Feb 2012 21:16:28 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q1FFkQ4M024825 for ; Thu, 16 Feb 2012 02:46:27 +1100 From: Harsh Prateek Bora Date: Wed, 15 Feb 2012 21:16:12 +0530 Message-Id: <1329320783-6365-4-git-send-email-harsh@linux.vnet.ibm.com> In-Reply-To: <1329320783-6365-1-git-send-email-harsh@linux.vnet.ibm.com> References: <1329320783-6365-1-git-send-email-harsh@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC PATCH v4 03/14] trace: [tracetool] Simplify event line parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, vilanova@ac.upc.edu, aneesh.kumar@linux.vnet.ibm.com From: Lluís Vilanova Signed-off-by: Lluís Vilanova Signed-off-by: Harsh Prateek Bora --- scripts/tracetool.py | 50 +++++++++++++++++--------------------------------- 1 files changed, 17 insertions(+), 33 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 274fa70..84003f5 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,21 +67,7 @@ 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 calc_sizeofargs(line): - args = get_args(line) - argc = get_argc(line) +def calc_sizeofargs(args, argc): str = [] newstr = "" if argc > 0: @@ -419,16 +395,24 @@ trace_gen = { } # A trace event +cre = re.compile("(?P[^(\s]+)\((?P[^)]*)\)\s*(?P\".*)?") + 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.sizestr = calc_sizeofargs(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.sizestr = calc_sizeofargs(self.args, self.argc) + self.fmt = groups["fmt"] self.properties = get_properties(line) # Generator that yields Event objects given a trace-events file object -- 1.7.1.1