From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7XwV-0002v3-M1 for qemu-devel@nongnu.org; Tue, 13 Mar 2012 16:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7XwO-000802-JU for qemu-devel@nongnu.org; Tue, 13 Mar 2012 16:03:35 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:38914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7XwO-0007zZ-99 for qemu-devel@nongnu.org; Tue, 13 Mar 2012 16:03:28 -0400 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Tue, 13 Mar 2012 21:03:21 +0100 Message-Id: <20120313200321.24179.96627.stgit@ginnungagap.bsc.es> In-Reply-To: <20120313200235.24179.63987.stgit@ginnungagap.bsc.es> References: <20120313200235.24179.63987.stgit@ginnungagap.bsc.es> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 08/12] trace: [tracetool] Rewrite event argument parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Adds an 'Arguments' class to describe event arguments. Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Harsh Prateek Bora --- scripts/tracetool.py | 113 ++++++++++++++++++++++++--------------------= ------ 1 files changed, 54 insertions(+), 59 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index d7c04b4..f017053 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -39,30 +39,6 @@ Options: ''' sys.exit(1) =20 -def get_argnames(args): - nfields =3D 0 - str =3D [] - for field in args.split(): - nfields =3D nfields + 1 - # Drop pointer star - type, ptr, tail =3D field.partition('*') - if type !=3D field: - field =3D tail - - name, sep, tail =3D field.partition(',') - - if name =3D=3D field: - continue - str.append(name) - str.append(", ") - - if nfields > 1: - str.append(name) - return ''.join(str) - else: - return '' - - def trace_h_begin(): print '''#ifndef TRACE_H #define TRACE_H @@ -102,11 +78,11 @@ def simple_h(events): print =20 for num, event in enumerate(events): - if event.argc: - argstr =3D event.argnames.split() - arg_prefix =3D '(uint64_t)(uintptr_t)' + if len(event.args): + argstr =3D event.args.names() + arg_prefix =3D ', (uint64_t)(uintptr_t)' cast_args =3D arg_prefix + arg_prefix.join(argstr) - simple_args =3D (str(num) + ', ' + cast_args) + simple_args =3D (str(num) + cast_args) else: simple_args =3D str(num) =20 @@ -116,7 +92,7 @@ def simple_h(events): }''' % { 'name': event.name, 'args': event.args, - 'argc': event.argc, + 'argc': len(event.args), 'trace_args': simple_args } print @@ -124,13 +100,6 @@ def simple_h(events): print 'extern TraceEvent trace_list[NR_TRACE_EVENTS];' =20 =20 -def is_string(arg): - strtype =3D ('const char*', 'char*', 'const char *', 'char *') - if arg.lstrip().startswith(strtype): - return True - else: - return False - def simple_c(events): print '#include "trace.h"' print @@ -150,11 +119,9 @@ def stderr_h(events): =20 extern TraceEvent trace_list[];''' for num, event in enumerate(events): - argnames =3D event.argnames - if event.argc > 0: - argnames =3D ', ' + event.argnames - else: - argnames =3D '' + argnames =3D ", ".join(event.args.names()) + if len(event.args) > 0: + argnames =3D ", " + argnames print ''' static inline void trace_%(name)s(%(args)s) { @@ -191,13 +158,13 @@ def ust_h(events): #undef wmb''' =20 for event in events: - if event.argc > 0: + if len(event.args) > 0: print ''' DECLARE_TRACE(ust_%(name)s, TP_PROTO(%(args)s), TP_ARGS(%(argnames)s)); #define trace_%(name)s trace_ust_%(name)s''' % { 'name': event.name, 'args': event.args, - 'argnames': event.argnames + 'argnames': ", ".join(event.args.names()) } else: print ''' @@ -215,9 +182,9 @@ def ust_c(events): #undef wmb #include "trace.h"''' for event in events: - argnames =3D event.argnames - if event.argc > 0: - argnames =3D ', ' + event.argnames + argnames =3D ", ".join(event.args.names()) + if len(event.args) > 0: + argnames =3D ', ' + argnames print ''' DEFINE_TRACE(ust_%(name)s); =20 @@ -265,7 +232,7 @@ def dtrace_h(events): 'name': event.name, 'args': event.args, 'uppername': event.name.upper(), - 'argnames': event.argnames, + 'argnames': ", ".join(event.args.names()), } =20 def dtrace_c(events): @@ -304,12 +271,12 @@ probe %(probeprefix)s.%(name)s =3D process("%(binar= y)s").mark("%(name)s") 'binary': binary } i =3D 1 - if event.argc > 0: - for arg in event.argnames.split(','): + if len(event.args) > 0: + for name in event.args.names(): # 'limit' is a reserved keyword - if arg =3D=3D 'limit': - arg =3D '_limit' - print ' %s =3D $arg%d;' % (arg.lstrip(), i) + if name =3D=3D 'limit': + name =3D '_limit' + print ' %s =3D $arg%d;' % (name.lstrip(), i) i +=3D 1 print '}' print @@ -383,6 +350,39 @@ trace_gen =3D { }, } =20 +# Event arguments +class Arguments: + def __init__ (self, arg_str): + self._args =3D [] + for arg in arg_str.split(","): + arg =3D arg.strip() + parts =3D arg.split() + head, sep, tail =3D parts[-1].rpartition("*") + parts =3D parts[:-1] + if tail =3D=3D "void": + assert len(parts) =3D=3D 0 and sep =3D=3D "" + continue + arg_type =3D " ".join(parts + [ " ".join([head, sep]).strip(= ) ]).strip() + self._args.append((arg_type, tail)) + + def __iter__(self): + return iter(self._args) + + def __len__(self): + return len(self._args) + + def __str__(self): + if len(self._args) =3D=3D 0: + return "void" + else: + return ", ".join([ " ".join([t, n]) for t,n in self._args ]) + + def names(self): + return [ name for _, name in self._args ] + + def types(self): + return [ type_ for type_, _ in self._args ] + # A trace event cre =3D re.compile("((?P.*)\s+)?(?P[^(\s]+)\((?P[^)]*= )\)\s*(?P\".*)?") =20 @@ -393,16 +393,11 @@ class Event(object): m =3D cre.match(line) assert m is not None groups =3D m.groupdict('') - self.args =3D groups["args"] - self.arglist =3D self.args.split(',') self.name =3D groups["name"] - if len(self.arglist) =3D=3D 1 and self.arglist[0] =3D=3D "void": - self.argc =3D 0 - else: - self.argc =3D len(self.arglist) - self.argnames =3D get_argnames(self.args) self.fmt =3D groups["fmt"] self.properties =3D groups["props"].split() + self.args =3D Arguments(groups["args"]) + unknown_props =3D set(self.properties) - VALID_PROPS if len(unknown_props) > 0: raise ValueError("Unknown properties: %s" % ", ".join(unknow= n_props))