openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

trace: give each trace event a named TraceEvent struct 

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 <vilanova@ac.upc.edu>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-10-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-10-04 14:35:48 +01:00 committed by Stefan Hajnoczi
parent a82417b50b
commit 79218be42b
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/tracetool/__init__.py
View File

@ -266,6 +266,7 @@ def formats(self):
QEMU_TRACE = "trace_%(name)s" QEMU_TRACE = "trace_%(name)s"
QEMU_TRACE_TCG = QEMU_TRACE + "_tcg" QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
QEMU_DSTATE = "_TRACE_%(NAME)s_DSTATE" QEMU_DSTATE = "_TRACE_%(NAME)s_DSTATE"
QEMU_EVENT = "_TRACE_%(NAME)s_EVENT"
def api(self, fmt=None): def api(self, fmt=None):
if fmt is None: if fmt is None:

19
scripts/tracetool/format/events_c.py
View File

@ -28,22 +28,29 @@ def generate(events, backend):
for e in events: for e in events:
out('uint16_t %s;' % e.api(e.QEMU_DSTATE)) out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
for e in events: for e in events:
if "vcpu" in e.properties: if "vcpu" in e.properties:
vcpu_id = "TRACE_VCPU_" + e.name.upper() vcpu_id = "TRACE_VCPU_" + e.name.upper()
else: else:
vcpu_id = "TRACE_VCPU_EVENT_COUNT" vcpu_id = "TRACE_VCPU_EVENT_COUNT"
out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,' out('TraceEvent %(event)s = {',
' .name = \"%(name)s\",' ' .id = %(id)s,',
' .sstate = %(sstate)s,', ' .vcpu_id = %(vcpu_id)s,',
' .dstate = &%(dstate)s, }, ', ' .name = \"%(name)s\",',
' .sstate = %(sstate)s,',
' .dstate = &%(dstate)s ',
'};',
event = e.api(e.QEMU_EVENT),
id = "TRACE_" + e.name.upper(), id = "TRACE_" + e.name.upper(),
vcpu_id = vcpu_id, vcpu_id = vcpu_id,
name = e.name, name = e.name,
sstate = "TRACE_%s_ENABLED" % e.name.upper(), sstate = "TRACE_%s_ENABLED" % e.name.upper(),
dstate = e.api(e.QEMU_DSTATE)) 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('};', out('};',
'') '')

11
scripts/tracetool/format/events_h.py
View File

@ -21,7 +21,13 @@ def generate(events, backend):
'', '',
'#ifndef TRACE__GENERATED_EVENTS_H', '#ifndef TRACE__GENERATED_EVENTS_H',
'#define 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 # event identifiers
out('typedef enum {') out('typedef enum {')
@ -58,6 +64,5 @@ def generate(events, backend):
enabled=enabled) enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
out('#include "trace/event-internal.h"', out('',
'',
'#endif /* TRACE__GENERATED_EVENTS_H */') '#endif /* TRACE__GENERATED_EVENTS_H */')

2
trace/control-internal.h
View File

@ -15,7 +15,7 @@
#include "qom/cpu.h" #include "qom/cpu.h"
extern TraceEvent trace_events[]; extern TraceEvent *trace_events[];
extern int trace_events_enabled_count; extern int trace_events_enabled_count;

2
trace/control.c
View File

@ -106,7 +106,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
TraceEvent *trace_event_iter_next(TraceEventIter *iter) TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{ {
while (iter->event < TRACE_EVENT_COUNT) { while (iter->event < TRACE_EVENT_COUNT) {
TraceEvent *ev = &(trace_events[iter->event]); TraceEvent *ev = trace_events[iter->event];
iter->event++; iter->event++;
if (!iter->pattern || if (!iter->pattern ||
pattern_glob(iter->pattern, pattern_glob(iter->pattern,