From patchwork Fri Feb 10 11:54:57 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: 140606 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 B995CB6EEC for ; Fri, 10 Feb 2012 23:52:29 +1100 (EST) Received: from localhost ([::1]:32844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvpxh-0008A2-5j for incoming@patchwork.ozlabs.org; Fri, 10 Feb 2012 07:52:25 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvp4K-0001EJ-P0 for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:55:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvp4E-00038E-PP for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:55:12 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:60329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvp4E-00036t-Bx for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:55:06 -0500 Received: from localhost (unknown [10.8.0.22]) by gw.ac.upc.edu (Postfix) with ESMTP id 2E32E2D000D; Fri, 10 Feb 2012 12:55:05 +0100 (CET) To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Vilanova Date: Fri, 10 Feb 2012 12:54:57 +0100 Message-ID: <20120210115457.9787.1686.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 05/11] trace: [tracetool] Add support for event properties 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 | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 07563f0..f369579 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -472,7 +472,9 @@ trace_gen = { # A trace event import re -cre = re.compile("(?P[^(\s]+)\((?P[^)]*)\)\s*(?P\".*)?") +cre = re.compile("((?P.*)\s+)?(?P[^(\s]+)\((?P[^)]*)\)\s*(?P\".*)?") + +VALID_PROPS = set(["disable"]) class Event(object): def __init__(self, line): @@ -489,6 +491,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):