From patchwork Wed Mar 21 21:52:55 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: 148079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 641C9B6EEF for ; Thu, 22 Mar 2012 09:12:53 +1100 (EST) Received: from localhost ([::1]:40796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SATTn-0004ug-4y for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 17:54:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SATTN-0004GM-Q1 for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:53:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SATTJ-0001gE-5U for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:53:37 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:42822 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SATTI-0001g1-RC for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:53:33 -0400 Received: from gw.ac.upc.edu (gw.ac.upc.es [147.83.30.3]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id q2LLrS7g002164; Wed, 21 Mar 2012 22:53:28 +0100 Received: from localhost (unknown [84.88.53.92]) by gw.ac.upc.edu (Postfix) with ESMTP id 5EDD22D0018; Wed, 21 Mar 2012 22:53:27 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2012 22:52:55 +0100 Message-Id: <20120321215255.3272.63777.stgit@ginnungagap.bsc.es> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> References: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.16 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id q2LLrS7g002164 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.33.10 Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v7 05/11] trace: [tracetool] Do not precompute the event number 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 An event number is implicit in its position on the list of events. Signed-off-by: Lluís Vilanova Signed-off-by: Harsh Prateek Bora --- scripts/tracetool.py | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 4f9060f..c2d5c24 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -106,14 +106,14 @@ def simple_h(events): print '#include "trace/simple.h"' print - for event in events: + for num, event in enumerate(events): if event.argc: argstr = event.argnames.split() arg_prefix = '(uint64_t)(uintptr_t)' cast_args = arg_prefix + arg_prefix.join(argstr) - simple_args = (str(event.num) + ', ' + cast_args) + simple_args = (str(num) + ', ' + cast_args) else: - simple_args = str(event.num) + simple_args = str(num) print '''static inline void trace_%(name)s(%(args)s) { @@ -125,7 +125,7 @@ def simple_h(events): 'trace_args': simple_args } print - print '#define NR_TRACE_EVENTS %d' % (event.num + 1) + print '#define NR_TRACE_EVENTS %d' % len(events) print 'extern TraceEvent trace_list[NR_TRACE_EVENTS];' @@ -154,7 +154,7 @@ def stderr_h(events): #include "trace/stderr.h" extern TraceEvent trace_list[];''' - for event in events: + for num, event in enumerate(events): argnames = event.argnames if event.argc > 0: argnames = ', ' + event.argnames @@ -169,12 +169,12 @@ static inline void trace_%(name)s(%(args)s) }''' % { 'name': event.name, 'args': event.args, - 'event_num': event.num, + 'event_num': num, 'fmt': event.fmt, 'argnames': argnames } print - print '#define NR_TRACE_EVENTS %d' % (event.num + 1) + print '#define NR_TRACE_EVENTS %d' % len(events) def stderr_c(events): print '''#include "trace.h" @@ -382,8 +382,7 @@ trace_gen = { cre = re.compile("(?P[^(\s]+)\((?P[^)]*)\)\s*(?P\".*)?") class Event(object): - def __init__(self, num, line): - self.num = num + def __init__(self, line): m = cre.match(line) assert m is not None groups = m.groupdict('') @@ -400,15 +399,13 @@ class Event(object): # Generator that yields Event objects given a trace-events file object def read_events(fobj): - event_num = 0 res = [] for line in fobj: if not line.strip(): continue if line.lstrip().startswith('#'): continue - res.append(Event(event_num, line)) - event_num += 1 + res.append(Event(line)) return res binary = ""