@@ -288,6 +288,9 @@ def dtrace_d(events):
print
print '};'
+def dtrace_nop_d(events):
+ pass
+
def dtrace_stp(events):
for event in events:
# Define prototype for probe arguments
@@ -309,6 +312,9 @@ probe %(probeprefix)s.%(name)s = process("%(binary)s").mark("%(name)s")
print '}'
print
+def dtrace_nop_stp(events):
+ pass
+
def trace_stap_begin():
print '/* This file is autogenerated by tracetool, do not edit. */'
@@ -332,6 +338,8 @@ converters = {
'nop': {
'h': nop_h,
'c': nop_c,
+ 'd': dtrace_nop_d,
+ 'stap': dtrace_nop_stp,
},
'stderr': {
@@ -482,17 +490,11 @@ def main():
if probeprefix == "":
probeprefix = 'qemu.' + targettype + '.' + targetarch
- disabled_events, enabled_events = [], []
- for e in read_events(sys.stdin):
- if 'disable' in e.properties:
- disabled_events.append(e)
- else:
- enabled_events.append(e)
+ events = read_events(sys.stdin)
trace_gen[output]['begin']()
- if output == 'h': # disabled events
- converters['nop'][output](disabled_events)
- converters[backend][output](enabled_events)
+ converters[backend][output]([ e for e in events if 'disable' not in e.properties ])
+ converters['nop'][output]([ e for e in events if 'disable' in e.properties ])
trace_gen[output]['end']()
if __name__ == "__main__":