From patchwork Fri Feb 3 21:11:34 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: 139458 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 06F43104796 for ; Sat, 4 Feb 2012 08:11:56 +1100 (EST) Received: from localhost ([::1]:53716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtQQD-0004Gv-P7 for incoming@patchwork.ozlabs.org; Fri, 03 Feb 2012 16:11:53 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtQQ8-0004FI-0X for qemu-devel@nongnu.org; Fri, 03 Feb 2012 16:11:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtQQ6-00070X-Rf for qemu-devel@nongnu.org; Fri, 03 Feb 2012 16:11:47 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:55644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtQQ6-00070N-BU for qemu-devel@nongnu.org; Fri, 03 Feb 2012 16:11:46 -0500 Received: from localhost (unknown [84.88.53.92]) by gw.ac.upc.edu (Postfix) with ESMTP id 7893F2D000D; Fri, 3 Feb 2012 22:11:44 +0100 (CET) To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Vilanova Date: Fri, 03 Feb 2012 22:11:34 +0100 Message-ID: <20120203211134.30134.73734.stgit@ginnungagap.bsc.es> In-Reply-To: <20120203211030.30134.94075.stgit@ginnungagap.bsc.es> References: <20120203211030.30134.94075.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] =?utf-8?b?W1BBVENIIHYyIDA0LzExXSB0cmFjZTogW8WncmFj?= =?utf-8?q?etool=5D_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 This would otherwise break event numbering when actually using the "disable" property. Signed-off-by: Lluís Vilanova --- scripts/tracetool.py | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index f675d96..94c8d7d 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -128,7 +128,7 @@ def simple_h(events): 'args': event.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];' return @@ -154,7 +154,7 @@ def simple_c(events): print print '};' print - for event in events: + for num, event in enumerate(events): argc = event.argc print '''void trace_%(name)s(%(args)s) { @@ -169,12 +169,12 @@ def simple_c(events): ''' % { 'name': event.name, 'args': event.args, - 'event_id': event.num, + 'event_id': num, } print ''' tbuf_idx = trace_alloc_record(%(event_id)s, %(sizestr)s); rec_off = (tbuf_idx + ST_V2_REC_HDR_LEN) %% TRACE_BUF_LEN; /* seek record header */ -''' % {'event_id': event.num, 'sizestr': event.sizestr,} +''' % {'event_id': num, 'sizestr': event.sizestr,} if argc > 0: str = event.arglist @@ -220,7 +220,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 @@ -235,12 +235,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.rstrip('\n'), '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" @@ -475,8 +475,7 @@ import re 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('') @@ -491,14 +490,12 @@ class Event(object): # Generator that yields Event objects given a trace-events file object def read_events(fobj): res = [] - event_num = 0 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 backend = ""