[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/20] trace: give each trace event a named TraceE
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 08/20] trace: give each trace event a named TraceEvent struct |
Date: |
Wed, 12 Oct 2016 10:47:26 +0200 |
From: "Daniel P. Berrange" <address@hidden>
Currently we only expose a TraceEvent array, which must
be indexed via the TraceEventID enum constants. This
changes the generator to expose a named TraceEvent
instance for each event, with an _EVENT suffix.
Reviewed-by: LluĂs Vilanova <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
scripts/tracetool/__init__.py | 1 +
scripts/tracetool/format/events_c.py | 19 +++++++++++++------
scripts/tracetool/format/events_h.py | 11 ++++++++---
trace/control-internal.h | 2 +-
trace/control.c | 2 +-
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index a11f36b..dc93416 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -266,6 +266,7 @@ class Event(object):
QEMU_TRACE = "trace_%(name)s"
QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
QEMU_DSTATE = "_TRACE_%(NAME)s_DSTATE"
+ QEMU_EVENT = "_TRACE_%(NAME)s_EVENT"
def api(self, fmt=None):
if fmt is None:
diff --git a/scripts/tracetool/format/events_c.py
b/scripts/tracetool/format/events_c.py
index ef873fa..a97054f 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -28,22 +28,29 @@ def generate(events, backend):
for e in events:
out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
- out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
-
for e in events:
if "vcpu" in e.properties:
vcpu_id = "TRACE_VCPU_" + e.name.upper()
else:
vcpu_id = "TRACE_VCPU_EVENT_COUNT"
- out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
- ' .name = \"%(name)s\",'
- ' .sstate = %(sstate)s,',
- ' .dstate = &%(dstate)s, }, ',
+ out('TraceEvent %(event)s = {',
+ ' .id = %(id)s,',
+ ' .vcpu_id = %(vcpu_id)s,',
+ ' .name = \"%(name)s\",',
+ ' .sstate = %(sstate)s,',
+ ' .dstate = &%(dstate)s ',
+ '};',
+ event = e.api(e.QEMU_EVENT),
id = "TRACE_" + e.name.upper(),
vcpu_id = vcpu_id,
name = e.name,
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
dstate = e.api(e.QEMU_DSTATE))
+ out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
+
+ for e in events:
+ out(' &%(event)s,', event = e.api(e.QEMU_EVENT))
+
out('};',
'')
diff --git a/scripts/tracetool/format/events_h.py
b/scripts/tracetool/format/events_h.py
index 03417de..80a66c5 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -21,7 +21,13 @@ def generate(events, backend):
'',
'#ifndef TRACE__GENERATED_EVENTS_H',
'#define TRACE__GENERATED_EVENTS_H',
- '')
+ '',
+ '#include "trace/event-internal.h"',
+ )
+
+ for e in events:
+ out('extern TraceEvent %(event)s;',
+ event = e.api(e.QEMU_EVENT))
# event identifiers
out('typedef enum {')
@@ -58,6 +64,5 @@ def generate(events, backend):
enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
- out('#include "trace/event-internal.h"',
- '',
+ out('',
'#endif /* TRACE__GENERATED_EVENTS_H */')
diff --git a/trace/control-internal.h b/trace/control-internal.h
index a6d8d2e..808f85d 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -15,7 +15,7 @@
#include "qom/cpu.h"
-extern TraceEvent trace_events[];
+extern TraceEvent *trace_events[];
extern int trace_events_enabled_count;
diff --git a/trace/control.c b/trace/control.c
index e57f2d3..9035846 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -106,7 +106,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char
*pattern)
TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{
while (iter->event < TRACE_EVENT_COUNT) {
- TraceEvent *ev = &(trace_events[iter->event]);
+ TraceEvent *ev = trace_events[iter->event];
iter->event++;
if (!iter->pattern ||
pattern_glob(iter->pattern,
--
2.7.4
- [Qemu-devel] [PULL v2 00/20] Tracing patches, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 01/20] trace: move colo trace events to net/ sub-directory, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 04/20] trace: remove some now unused functions, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 02/20] trace: add trace event iterator APIs, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 03/20] trace: convert code to use event iterators, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 05/20] trace: remove global 'uint16 dstate[]' array, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 06/20] trace: remove duplicate control.h includes in generated-tracers.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 07/20] trace: break circular dependency in event-internal.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 08/20] trace: give each trace event a named TraceEvent struct,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 09/20] trace: remove the TraceEventID and TraceEventVCPUID enums, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 10/20] trace: emit name <-> ID mapping in simpletrace header, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 11/20] trace: don't abort qemu if ftrace can't be initialized, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 12/20] trace: provide mechanism for registering trace events, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 13/20] trace: dynamically allocate trace_dstate in CPUState, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 14/20] trace: dynamically allocate event IDs at runtime, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 15/20] trace: get rid of generated-events.h/generated-events.c, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 16/20] trace: rename _read_events to read_events, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 17/20] trace: push reading of events up a level to tracetool main, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 18/20] trace: pass trace-events to tracetool as a positional param, Stefan Hajnoczi, 2016/10/12