aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-11-02 12:00:53 +0000
committerStefan Hajnoczi <stefanha@redhat.com>2012-11-16 13:12:13 +0100
commit81dee729c1a8fccaab8cd978721acca0282f43c9 (patch)
treecdfb89efb25ea571cfc6ecdcfa2cfa50a1f2e5bc /scripts
parent6801038bc52d61f81ac8a25fbe392f1bad982887 (diff)
downloadqemu-81dee729c1a8fccaab8cd978721acca0282f43c9.zip
qemu-81dee729c1a8fccaab8cd978721acca0282f43c9.tar.gz
qemu-81dee729c1a8fccaab8cd978721acca0282f43c9.tar.bz2
Avoid all systemtap reserved words
Over time various systemtap reserved words have been blacklisted in the trace backend generator. The list is not complete though, so there is continued risk of problems in the future. Preempt such problems by specifying the full list of systemtap keywords listed in its parser as identified here: http://sourceware.org/ml/systemtap/2012-q4/msg00157.html Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/tracetool/backend/dtrace.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
index 6be7047..23c43e2 100644
--- a/scripts/tracetool/backend/dtrace.py
+++ b/scripts/tracetool/backend/dtrace.py
@@ -73,6 +73,15 @@ def d(events):
'};')
+# Technically 'self' is not used by systemtap yet, but
+# they recommended we keep it in the reserved list anyway
+RESERVED_WORDS = (
+ 'break', 'catch', 'continue', 'delete', 'else', 'for',
+ 'foreach', 'function', 'global', 'if', 'in', 'limit',
+ 'long', 'next', 'probe', 'return', 'self', 'string',
+ 'try', 'while'
+ )
+
def stap(events):
for e in events:
# Define prototype for probe arguments
@@ -87,7 +96,7 @@ def stap(events):
if len(e.args) > 0:
for name in e.args.names():
# Append underscore to reserved keywords
- if name in ('limit', 'in', 'next', 'self', 'function'):
+ if name in RESERVED_WORDS:
name += '_'
out(' %s = $arg%d;' % (name, i))
i += 1