On Wed, Sep 28, 2016 at 02:08:23PM +0100, Daniel P. Berrange wrote: > 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. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > scripts/tracetool.py | 15 ++++++++++++++- > scripts/tracetool/__init__.py | 6 ++++-- > scripts/tracetool/backend/__init__.py | 12 ++++++------ > scripts/tracetool/backend/dtrace.py | 4 ++-- > scripts/tracetool/backend/ftrace.py | 5 +++-- > scripts/tracetool/backend/log.py | 4 ++-- > scripts/tracetool/backend/simple.py | 8 ++++---- > scripts/tracetool/backend/syslog.py | 4 ++-- > scripts/tracetool/backend/ust.py | 4 ++-- > scripts/tracetool/format/__init__.py | 4 ++-- > scripts/tracetool/format/c.py | 18 ++++++++++-------- > scripts/tracetool/format/d.py | 2 +- > scripts/tracetool/format/h.py | 14 +++++++------- > scripts/tracetool/format/simpletrace_stap.py | 2 +- > scripts/tracetool/format/stap.py | 2 +- > scripts/tracetool/format/tcg_h.py | 2 +- > scripts/tracetool/format/tcg_helper_c.py | 2 +- > scripts/tracetool/format/tcg_helper_h.py | 2 +- > scripts/tracetool/format/tcg_helper_wrapper_h.py | 2 +- > scripts/tracetool/format/ust_events_c.py | 2 +- > scripts/tracetool/format/ust_events_h.py | 9 +++++---- > 21 files changed, 71 insertions(+), 52 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
signature.asc
Description: PGP signature
