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>
		
			
				
	
	
		
			105 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			105 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
#!/usr/bin/env python
 | 
						|
# -*- coding: utf-8 -*-
 | 
						|
 | 
						|
"""
 | 
						|
trace/generated-tracers.h
 | 
						|
"""
 | 
						|
 | 
						|
__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"
 | 
						|
__copyright__  = "Copyright 2012-2017, 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):
 | 
						|
    if group == "root":
 | 
						|
        header = "trace/control-vcpu.h"
 | 
						|
    else:
 | 
						|
        header = "trace/control.h"
 | 
						|
 | 
						|
    out('/* This file is autogenerated by tracetool, do not edit. */',
 | 
						|
        '',
 | 
						|
        '#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
 | 
						|
        '#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
 | 
						|
        '',
 | 
						|
        '#include "%s"' % header,
 | 
						|
        '')
 | 
						|
 | 
						|
    for e in events:
 | 
						|
        out('extern TraceEvent %(event)s;',
 | 
						|
            event = e.api(e.QEMU_EVENT))
 | 
						|
 | 
						|
    for e in events:
 | 
						|
        out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
 | 
						|
 | 
						|
    # static state
 | 
						|
    for e in events:
 | 
						|
        if 'disable' in e.properties:
 | 
						|
            enabled = 0
 | 
						|
        else:
 | 
						|
            enabled = 1
 | 
						|
        if "tcg-exec" in e.properties:
 | 
						|
            # a single define for the two "sub-events"
 | 
						|
            out('#define TRACE_%(name)s_ENABLED %(enabled)d',
 | 
						|
                name=e.original.name.upper(),
 | 
						|
                enabled=enabled)
 | 
						|
        out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
 | 
						|
 | 
						|
    backend.generate_begin(events, group)
 | 
						|
 | 
						|
    for e in events:
 | 
						|
        # tracer-specific dstate
 | 
						|
        out('',
 | 
						|
            '#define %(api)s() ( \\',
 | 
						|
            api=e.api(e.QEMU_BACKEND_DSTATE))
 | 
						|
 | 
						|
        if "disable" not in e.properties:
 | 
						|
            backend.generate_backend_dstate(e, group)
 | 
						|
 | 
						|
        out('    false)')
 | 
						|
 | 
						|
        # tracer without checks
 | 
						|
        out('',
 | 
						|
            'static inline void %(api)s(%(args)s)',
 | 
						|
            '{',
 | 
						|
            api=e.api(e.QEMU_TRACE_NOCHECK),
 | 
						|
            args=e.args)
 | 
						|
 | 
						|
        if "disable" not in e.properties:
 | 
						|
            backend.generate(e, group)
 | 
						|
 | 
						|
        out('}')
 | 
						|
 | 
						|
        # tracer wrapper with checks (per-vCPU tracing)
 | 
						|
        if "vcpu" in e.properties:
 | 
						|
            trace_cpu = next(iter(e.args))[1]
 | 
						|
            cond = "trace_event_get_vcpu_state(%(cpu)s,"\
 | 
						|
                   " TRACE_%(id)s)"\
 | 
						|
                   % dict(
 | 
						|
                       cpu=trace_cpu,
 | 
						|
                       id=e.name.upper())
 | 
						|
        else:
 | 
						|
            cond = "true"
 | 
						|
 | 
						|
        out('',
 | 
						|
            'static inline void %(api)s(%(args)s)',
 | 
						|
            '{',
 | 
						|
            '    if (%(cond)s) {',
 | 
						|
            '        %(api_nocheck)s(%(names)s);',
 | 
						|
            '    }',
 | 
						|
            '}',
 | 
						|
            api=e.api(),
 | 
						|
            api_nocheck=e.api(e.QEMU_TRACE_NOCHECK),
 | 
						|
            args=e.args,
 | 
						|
            names=", ".join(e.args.names()),
 | 
						|
            cond=cond)
 | 
						|
 | 
						|
    backend.generate_end(events, group)
 | 
						|
 | 
						|
    out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())
 |