From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnS7x-0008Hp-Pz for qemu-devel@nongnu.org; Wed, 18 Jan 2012 04:48:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnS7v-0004Wf-R9 for qemu-devel@nongnu.org; Wed, 18 Jan 2012 04:48:21 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:58259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnS7v-0004WB-4y for qemu-devel@nongnu.org; Wed, 18 Jan 2012 04:48:19 -0500 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Jan 2012 15:18:07 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0I9m3dS4616340 for ; Wed, 18 Jan 2012 15:18:04 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0I9m2bK003396 for ; Wed, 18 Jan 2012 20:48:03 +1100 Message-ID: <4F169552.5070705@linux.vnet.ibm.com> Date: Wed, 18 Jan 2012 15:18:02 +0530 From: Harsh Bora MIME-Version: 1.0 References: <20120111180504.25198.76946.stgit@ginnungagap.bsc.es> <20120111180535.25198.43232.stgit@ginnungagap.bsc.es> In-Reply-To: <20120111180535.25198.43232.stgit@ginnungagap.bsc.es> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] =?utf-8?b?W1BBVENIIDMvNl0gdHJhY2U6IFvFp3JhY2V0b29s?= =?utf-8?q?=5D_Do_not_precompute_the_event_number?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TGx1w61zIFZpbGFub3Zh?= Cc: aneesh.kumar@linux.vnet.ibm.com, qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com On 01/11/2012 11:35 PM, Lluís Vilanova wrote: > This would otherwise break event numbering when actually using the "disable" > property. > IIUC, event numbering does include disabled events too, are you proposing not to include disabled events in event numbering ? That will affect interpreting event numbers while reading trace logs also. - Harsh > 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 7a877dc..b7401a3 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 = "" > >