[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v5 04/14] trace: [tracetool] Do not precompute t
From: |
Harsh Prateek Bora |
Subject: |
[Qemu-devel] [RFC PATCH v5 04/14] trace: [tracetool] Do not precompute the event number |
Date: |
Thu, 1 Mar 2012 18:55:30 +0530 |
From: Lluís Vilanova <address@hidden>
Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Harsh Prateek Bora <address@hidden>
---
scripts/tracetool.py | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 84003f5..1085fc4 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -120,14 +120,14 @@ def simple_h(events):
print '#include "trace/simple.h"'
print
- for event in events:
+ for num, event in enumerate(events):
if event.argc:
argstr = event.argnames.split()
arg_prefix = '(uint64_t)(uintptr_t)'
cast_args = arg_prefix + arg_prefix.join(argstr)
- simple_args = (str(event.num) + ', ' + cast_args)
+ simple_args = (str(num) + ', ' + cast_args)
else:
- simple_args = str(event.num)
+ simple_args = str(num)
print '''static inline void trace_%(name)s(%(args)s)
{
@@ -139,7 +139,7 @@ def simple_h(events):
'trace_args': simple_args
}
print
- print '#define NR_TRACE_EVENTS %d' % (event.num + 1)
+ print '#define NR_TRACE_EVENTS %d' % len(events)
print 'extern TraceEvent trace_list[NR_TRACE_EVENTS];'
@@ -168,7 +168,7 @@ def stderr_h(events):
#include "trace/stderr.h"
extern TraceEvent trace_list[];'''
- for event in events:
+ for num, event in enumerate(events):
argnames = event.argnames
if event.argc > 0:
argnames = ', ' + event.argnames
@@ -183,12 +183,12 @@ static inline void trace_%(name)s(%(args)s)
}''' % {
'name': event.name,
'args': event.args,
- 'event_num': event.num,
+ 'event_num': num,
'fmt': event.fmt,
'argnames': argnames
}
print
- print '#define NR_TRACE_EVENTS %d' % (event.num + 1)
+ print '#define NR_TRACE_EVENTS %d' % len(events)
def stderr_c(events):
print '''#include "trace.h"
@@ -398,8 +398,7 @@ trace_gen = {
cre = re.compile("(?P<name>[^(\s]+)\((?P<args>[^)]*)\)\s*(?P<fmt>\".*)?")
class Event(object):
- def __init__(self, num, line):
- self.num = num
+ def __init__(self, line):
m = cre.match(line)
assert m is not None
groups = m.groupdict('')
@@ -417,15 +416,13 @@ class Event(object):
# Generator that yields Event objects given a trace-events file object
def read_events(fobj):
- event_num = 0
res = []
for line in fobj:
if not line.strip():
continue
if line.lstrip().startswith('#'):
continue
- res.append(Event(event_num, line))
- event_num += 1
+ res.append(Event(line))
return res
binary = ""
--
1.7.1.1
- [Qemu-devel] [RFC PATCH v5 12/14] monitor: remove unused do_info_trace, (continued)
- [Qemu-devel] [RFC PATCH v5 12/14] monitor: remove unused do_info_trace, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 14/14] scripts/simpltrace.py changes: Support simplettrace v2, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 05/14] trace: [tracetool] Add support for event properties, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 07/14] trace: [tracetool] Rewrite event argument parsing, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 11/14] trace: [tracetool] Add error-reporting functions, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 02/14] trace: [tracetool] Do not rebuild event list in backend code, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 08/14] trace: [tracetool] Make format-specific code optional with access to events, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 03/14] trace: [tracetool] Simplify event line parsing, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 13/14] Simpletrace v2: Handle var num of args, strings., Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 09/14] trace: [tracetool] Automatically establish available backends and formats, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 04/14] trace: [tracetool] Do not precompute the event number,
Harsh Prateek Bora <=
- [Qemu-devel] [RFC PATCH v5 10/14] trace: Provide a per-event status define for conditional compilation, Harsh Prateek Bora, 2012/03/01
- [Qemu-devel] [RFC PATCH v5 01/14] Converting tracetool.sh to tracetool.py, Harsh Prateek Bora, 2012/03/01
- Re: [Qemu-devel] [RFC PATCH v5 00/14] Tracing Improvements, Simpletrace v2, Lluís Vilanova, 2012/03/13