13d4ff07e8
docs/devel/tracing.txt explains "since many source files include trace.h, [the generated trace.h use] a minimum of types and other header files included to keep the namespace clean and compile times and dependencies down." Commit 4815185902 "trace: Add per-vCPU tracing states for events with the 'vcpu' property" made them all include qom/cpu.h via control-internal.h. qom/cpu.h in turn includes about thirty headers. Ouch. Per-vCPU tracing is currently not supported in sub-directories' trace-events. In other words, qom/cpu.h can only be used in trace-root.h, not in any trace.h. Split trace/control-vcpu.h off trace/control.h and trace/control-internal.h. Have the generated trace.h include trace/control.h (which no longer includes qom/cpu.h), and trace-root.h include trace/control-vcpu.h (which includes it). The resulting improvement is a bit disappointing: in my "build everything" tree, some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h) depend on a trace.h, and about 600 of them no longer depend on qom/cpu.h. But more than 1300 others depend on trace-root.h. More work is clearly needed. Left for another day. Cc: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190812052359.30071-8-armbru@redhat.com>
77 lines
2.1 KiB
Python
77 lines
2.1 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
trace/generated-tracers.c
|
|
"""
|
|
|
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
|
__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>"
|
|
__license__ = "GPL version 2 or (at your option) any later version"
|
|
|
|
__maintainer__ = "Stefan Hajnoczi"
|
|
__email__ = "stefanha@linux.vnet.ibm.com"
|
|
|
|
|
|
from tracetool import out
|
|
|
|
|
|
def generate(events, backend, group):
|
|
active_events = [e for e in events
|
|
if "disable" not in e.properties]
|
|
|
|
if group == "root":
|
|
header = "trace-root.h"
|
|
else:
|
|
header = "trace.h"
|
|
|
|
out('/* This file is autogenerated by tracetool, do not edit. */',
|
|
'',
|
|
'#include "qemu/osdep.h"',
|
|
'#include "qemu/module.h"',
|
|
'#include "%s"' % header,
|
|
'')
|
|
|
|
for e in events:
|
|
out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
|
|
|
|
for e in events:
|
|
if "vcpu" in e.properties:
|
|
vcpu_id = 0
|
|
else:
|
|
vcpu_id = "TRACE_VCPU_EVENT_NONE"
|
|
out('TraceEvent %(event)s = {',
|
|
' .id = 0,',
|
|
' .vcpu_id = %(vcpu_id)s,',
|
|
' .name = \"%(name)s\",',
|
|
' .sstate = %(sstate)s,',
|
|
' .dstate = &%(dstate)s ',
|
|
'};',
|
|
event = e.api(e.QEMU_EVENT),
|
|
vcpu_id = vcpu_id,
|
|
name = e.name,
|
|
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
|
|
dstate = e.api(e.QEMU_DSTATE))
|
|
|
|
out('TraceEvent *%(group)s_trace_events[] = {',
|
|
group = group.lower())
|
|
|
|
for e in events:
|
|
out(' &%(event)s,', event = e.api(e.QEMU_EVENT))
|
|
|
|
out(' NULL,',
|
|
'};',
|
|
'')
|
|
|
|
out('static void trace_%(group)s_register_events(void)',
|
|
'{',
|
|
' trace_event_register_group(%(group)s_trace_events);',
|
|
'}',
|
|
'trace_init(trace_%(group)s_register_events)',
|
|
group = group.lower())
|
|
|
|
backend.generate_begin(active_events, group)
|
|
for event in active_events:
|
|
backend.generate(event, group)
|
|
backend.generate_end(active_events, group)
|