From patchwork Fri Feb 10 11:54:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 140637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 724FCB6F98 for ; Sat, 11 Feb 2012 00:42:05 +1100 (EST) Received: from localhost ([::1]:38334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvp4V-0001TC-UH for incoming@patchwork.ozlabs.org; Fri, 10 Feb 2012 06:55:23 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvp49-0000m4-QX for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:55:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvp43-00031R-Qr for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:55:01 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:60319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvp43-00031A-Fx for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:54:55 -0500 Received: from localhost (unknown [10.8.0.22]) by gw.ac.upc.edu (Postfix) with ESMTP id 47BF82D000D; Fri, 10 Feb 2012 12:54:54 +0100 (CET) To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Vilanova Date: Fri, 10 Feb 2012 12:54:46 +0100 Message-ID: <20120210115446.9787.27875.stgit@ginnungagap.bsc.es> In-Reply-To: <20120210115429.9787.92858.stgit@ginnungagap.bsc.es> References: <20120210115429.9787.92858.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.30.3 Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v4 03/11] trace: [tracetool] Simplify event line parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lluís Vilanova --- scripts/tracetool.py | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 7042728..b0c1904 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -38,19 +38,9 @@ Options: ''' sys.exit(1) -def get_name(line, sep='('): - head, sep, tail = line.partition(sep) - return head - -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 @@ -71,21 +61,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 - -def calc_sizeofargs(line): - args = get_args(line) - argc = get_argc(line) +def calc_sizeofargs(args, argc): strtype = ('const char*', 'char*', 'const char *', 'char *') str = [] newstr = "" @@ -495,16 +471,25 @@ trace_gen = { } # A trace event +import re +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"] # Generator that yields Event objects given a trace-events file object def read_events(fobj):