[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/12] trace: [tracetool] Make format-specific code
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH 09/12] trace: [tracetool] Make format-specific code optional and with access to events |
Date: |
Tue, 13 Mar 2012 21:03:27 +0100 |
User-agent: |
StGit/0.16 |
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 f017053..377c683 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:
@@ -284,18 +279,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 = {
@@ -331,22 +320,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,
},
}
@@ -488,10 +474,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()
- [Qemu-devel] [PATCH 00/12] Rewrite tracetool using python, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 02/12] trace: [tracetool] Remove unused 'sizestr' attribute in 'Event', Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 01/12] Converting tracetool.sh to tracetool.py, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 05/12] trace: [tracetool] Do not precompute the event number, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 06/12] trace: [tracetool] Add support for event properties, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 07/12] trace: [tracetool] Process the "disable" event property, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 03/12] trace: [tracetool] Do not rebuild event list in backend code, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 04/12] trace: [tracetool] Simplify event line parsing, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 08/12] trace: [tracetool] Rewrite event argument parsing, Lluís Vilanova, 2012/03/13
- [Qemu-devel] [PATCH 09/12] trace: [tracetool] Make format-specific code optional and with access to events,
Lluís Vilanova <=
- [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/13
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Stefan Hajnoczi, 2012/03/20
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/20
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Stefan Hajnoczi, 2012/03/20
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/20
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Stefan Hajnoczi, 2012/03/21
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/21
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Stefan Hajnoczi, 2012/03/22
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/21
- Re: [Qemu-devel] [PATCH 10/12] trace: [tracetool] Automatically establish available backends and formats, Lluís Vilanova, 2012/03/21