[Qemu-devel] [PATCH v7 09/11] trace: [tracetool] Make format-specific code optional and with access to events

[Lluís Vilanova]

First, routines for format-specific code are not mandatory.

Second, all format-specific routines get the list of events as an argument.

Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Harsh Prateek Bora <address@hidden>
---
 scripts/tracetool.py |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 3c47252..5379e19 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -39,7 +39,7 @@ Options:
 '''
     sys.exit(1)
 
-def trace_h_begin():
+def trace_h_begin(events):
     print '''#ifndef TRACE_H
 #define TRACE_H
 
@@ -47,17 +47,12 @@ def trace_h_begin():
 
 #include "qemu-common.h"'''
 
-
-def trace_h_end():
+def trace_h_end(events):
     print '#endif /* TRACE_H */'
 
-
-def trace_c_begin():
+def trace_c_begin(events):
     print '/* This file is autogenerated by tracetool, do not edit. */'
 
-def trace_c_end():
-    pass # nop, required for trace_gen
-
 def nop_h(events):
     print
     for event in events:
@@ -282,18 +277,12 @@ probe %(probeprefix)s.%(name)s = 
process("%(binary)s").mark("%(name)s")
 def dtrace_nop_stp(events):
     pass
 
-def trace_stap_begin():
+def trace_stap_begin(events):
     print '/* This file is autogenerated by tracetool, do not edit. */'
 
-def trace_stap_end():
-    pass #nop, reqd for trace_gen
-
-def trace_d_begin():
+def trace_d_begin(events):
     print '/* This file is autogenerated by tracetool, do not edit. */'
 
-def trace_d_end():
-    pass #nop, reqd for trace_gen
-
 
 # Registry of backends and their converter functions
 converters = {
@@ -329,22 +318,19 @@ converters = {
 }
 
 # Trace file header and footer code generators
-trace_gen = {
+formats = {
     'h': {
         'begin': trace_h_begin,
         'end': trace_h_end,
     },
     'c': {
         'begin': trace_c_begin,
-        'end': trace_c_end,
     },
     'd': {
         'begin': trace_d_begin,
-        'end': trace_d_end,
     },
     'stap': {
         'begin': trace_stap_begin,
-        'end': trace_stap_end,
     },
 }
 
@@ -487,10 +473,12 @@ def main():
 
     events = read_events(sys.stdin)
 
-    trace_gen[output]['begin']()
+    if 'begin' in formats[output]:
+        formats[output]['begin'](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 'end' in formats[output]:
+        formats[output]['end'](events)
 
 if __name__ == "__main__":
     main()