From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSY9j-0001FQ-KI for qemu-devel@nongnu.org; Mon, 02 Mar 2015 16:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSY9i-0006O5-BF for qemu-devel@nongnu.org; Mon, 02 Mar 2015 16:45:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSY9h-0006Nn-R4 for qemu-devel@nongnu.org; Mon, 02 Mar 2015 16:45:38 -0500 From: Stefan Hajnoczi Date: Mon, 2 Mar 2015 15:45:22 -0600 Message-Id: <1425332722-4747-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1425332722-4747-1-git-send-email-stefanha@redhat.com> References: <1425332722-4747-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/2] trace: add DTrace reserved words for .d files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi DTrace on Mac OS X fails due to trace events using 'self' as an argument name: GEN trace/generated-tracers-dtrace.h dtrace: failed to compile script trace/generated-tracers-dtrace.dtrace: l= ine 1330: syntax error, unexpected DT_KEY_SELF, expecting ) near "self" make: *** [trace/generated-tracers-dtrace.h] Error 1 Filter argument names according to the list of DTrace .d file reserved keywords. Note that DTrace on Mac and Linux still do not work after this patch. There are additional build issues remaining. Reported-by: Henk Poley Tested-by: Henk Poley Cc: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/format/d.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.p= y index 46eebb1..c77d5b7 100644 --- a/scripts/tracetool/format/d.py +++ b/scripts/tracetool/format/d.py @@ -16,6 +16,19 @@ __email__ =3D "stefanha@linux.vnet.ibm.com" from tracetool import out =20 =20 +# Reserved keywords from +# https://wikis.oracle.com/display/DTrace/Types,+Operators+and+Expressio= ns +RESERVED_WORDS =3D ( + 'auto', 'goto', 'sizeof', 'break', 'if', 'static', 'case', 'import', + 'string', 'char', 'inline', 'stringof', 'const', 'int', 'struct', + 'continue', 'long', 'switch', 'counter', 'offsetof', 'this', + 'default', 'probe', 'translator', 'do', 'provider', 'typedef', + 'double', 'register', 'union', 'else', 'restrict', 'unsigned', + 'enum', 'return', 'void', 'extern', 'self', 'volatile', 'float', + 'short', 'while', 'for', 'signed', 'xlate', +) + + def generate(events, backend): events =3D [e for e in events if "disable" not in e.properties] @@ -25,18 +38,17 @@ def generate(events, backend): 'provider qemu {') =20 for e in events: - args =3D str(e.args) - - # DTrace provider syntax expects foo() for empty - # params, not foo(void) - if args =3D=3D 'void': - args =3D '' + args =3D [] + for type_, name in e.args: + if name in RESERVED_WORDS: + name +=3D '_' + args.append(type_ + ' ' + name) =20 # Define prototype for probe arguments out('', 'probe %(name)s(%(args)s);', name=3De.name, - args=3Dargs) + args=3D','.join(args)) =20 out('', '};') --=20 2.1.0