The TraceEventID and TraceEventVCPUID enums constants are no longer actually used for anything critical. The TRACE_EVENT_COUNT limit is used to determine the size of the TraceEvents array, and can be removed if we just NULL terminate the array instead. The TRACE_VCPU_EVENT_COUNT limit is used as a magic value for marking non-vCPU events, and also for declaring the size of the trace dstate mask in the CPUState struct. The former usage can be replaced by a dedicated constant TRACE_EVENT_VCPU_NONE, defined as (uint32_t)-1. For the latter usage, we can simply define a constant for the number of VCPUs, avoiding the need for the full enum. The only other usages of the enum values can be replaced by accesing the id/vcpu_id fields via the named TraceEvent structs. 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-11-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
			
				
	
	
		
			59 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
#!/usr/bin/env python
 | 
						|
# -*- coding: utf-8 -*-
 | 
						|
 | 
						|
"""
 | 
						|
trace/generated-tracers.h
 | 
						|
"""
 | 
						|
 | 
						|
__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"
 | 
						|
__copyright__  = "Copyright 2012-2016, 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):
 | 
						|
    out('/* This file is autogenerated by tracetool, do not edit. */',
 | 
						|
        '',
 | 
						|
        '#ifndef TRACE__GENERATED_TRACERS_H',
 | 
						|
        '#define TRACE__GENERATED_TRACERS_H',
 | 
						|
        '',
 | 
						|
        '#include "qemu-common.h"',
 | 
						|
        '#include "trace/control.h"',
 | 
						|
        '')
 | 
						|
 | 
						|
    backend.generate_begin(events)
 | 
						|
 | 
						|
    for e in events:
 | 
						|
        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=e.api(),
 | 
						|
            args=e.args,
 | 
						|
            cond=cond)
 | 
						|
 | 
						|
        if "disable" not in e.properties:
 | 
						|
            backend.generate(e)
 | 
						|
 | 
						|
        out('    }',
 | 
						|
            '}')
 | 
						|
 | 
						|
    backend.generate_end(events)
 | 
						|
 | 
						|
    out('#endif /* TRACE__GENERATED_TRACERS_H */')
 |