system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-22 19:04:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trace: add DTrace reserved words for .d files

Browse source 
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: line 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 <henkpoley@gmail.com>
Tested-by: Henk Poley <henkpoley@gmail.com>
Cc: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2014-08-14 11:39:23 +01:00
parent ba79576185
commit 0b7e89b103
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/tracetool/format/d.py
View file

@ -16,6 +16,19 @@
from tracetool import out from tracetool import out
# Reserved keywords from
# https://wikis.oracle.com/display/DTrace/Types,+Operators+and+Expressions
RESERVED_WORDS = (
'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): def generate(events, backend):
events = [e for e in events events = [e for e in events
if "disable" not in e.properties] if "disable" not in e.properties]
@ -25,18 +38,17 @@ def generate(events, backend):
'provider qemu {') 'provider qemu {')
for e in events: for e in events:
args = str(e.args) args = []
for type_, name in e.args:
# DTrace provider syntax expects foo() for empty if name in RESERVED_WORDS:
# params, not foo(void) name += '_'
if args == 'void': args.append(type_ + ' ' + name)
args = ''
# Define prototype for probe arguments # Define prototype for probe arguments
out('', out('',
'probe %(name)s(%(args)s);', 'probe %(name)s(%(args)s);',
name=e.name, name=e.name,
args=args) args=','.join(args))
out('', out('',
'};') '};')