motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

trace: introduce a formal group name for trace events

Browse source 
The declarations in the generated-tracers.h file are
assuming there's only ever going to be one instance
of this header, as they are not namespaced. When we
have one header per event group, if a single source
file needs to include multiple sets of trace events,
the symbols will all clash.

This change thus introduces a '--group NAME' arg to the
'tracetool' program. This will cause all the symbols in
the generated header files to be given a unique namespace.

If no group is given, the group name 'common' is used,
which is suitable for the current usage where there is
only one global trace-events file used for code generation.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
Message-id: 1475588159-30598-21-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:59 +01:00 • committed by Stefan Hajnoczi
parent 0bc6484d58
commit 80dd5c4918
21 changed files with 73 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/tracetool/format/h.py
View file

@ -16,11 +16,11 @@ __email__ = "stefanha@linux.vnet.ibm.com"
from tracetool import out
def generate(events, backend):
def generate(events, backend, group):
out('/* This file is autogenerated by tracetool, do not edit. */',
'',
'#ifndef TRACE__GENERATED_TRACERS_H',
'#define TRACE__GENERATED_TRACERS_H',
'#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
'#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
'',
'#include "qemu-common.h"',
'#include "trace/control.h"',
@ -46,7 +46,7 @@ def generate(events, backend):
enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
backend.generate_begin(events)
backend.generate_begin(events, group)
for e in events:
if "vcpu" in e.properties:
@ -68,11 +68,11 @@ def generate(events, backend):
cond=cond)
if "disable" not in e.properties:
backend.generate(e)
backend.generate(e, group)
out(' }',
'}')
backend.generate_end(events)
backend.generate_end(events, group)
out('#endif /* TRACE__GENERATED_TRACERS_H */')
out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())