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>
54 lines
1.5 KiB
Python
54 lines
1.5 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
trace/generated-events.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_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))
|
|
|
|
for e in events:
|
|
out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
|
|
|
|
numvcpu = len([e for e in events if "vcpu" in e.properties])
|
|
|
|
out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
|
|
|
|
# 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))
|
|
|
|
out('',
|
|
'#endif /* TRACE__GENERATED_EVENTS_H */')
|