From 30c8f7349c0990934989a9af766d9b1e1fc3bda9 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 6 Apr 2016 12:50:50 -0400 Subject: [PATCH] gen, templates: generate prefix/default stream definitions Signed-off-by: Philippe Proulx --- barectf/gen.py | 15 +++++++++++++-- barectf/templates.py | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/barectf/gen.py b/barectf/gen.py index 0e71e81..6d136e1 100644 --- a/barectf/gen.py +++ b/barectf/gen.py @@ -343,11 +343,23 @@ class CCodeGenerator: self._cg.reset() dt = datetime.datetime.now().isoformat() bh_filename = self.get_bitfield_header_filename() + prefix_def = '' + default_stream_def = '' + + if self._cfg.options.gen_prefix_def: + prefix_def = '#define _BARECTF_PREFIX {}'.format(self._cfg.prefix) + + if self._cfg.options.gen_default_stream_def: + s_name = self._cfg.options.gen_default_stream_def + default_stream_def = '#define _BARECTF_DEFAULT_STREAM {}'.format(s_name) + tmpl = templates._HEADER_BEGIN self._cg.add_lines(tmpl.format(prefix=self._cfg.prefix, ucprefix=self._cfg.prefix.upper(), bitfield_header_filename=bh_filename, - version=barectf.__version__, date=dt)) + version=barectf.__version__, date=dt, + prefix_def=prefix_def, + default_stream_def=default_stream_def)) self._cg.add_empty_line() # platform callbacks structure @@ -1000,7 +1012,6 @@ class CCodeGenerator: self._generate_func_trace(stream, ev) self._cg.add_empty_line() - return self._cg.code def get_header_filename(self): diff --git a/barectf/templates.py b/barectf/templates.py index b4d901f..1a242fd 100644 --- a/barectf/templates.py +++ b/barectf/templates.py @@ -236,6 +236,9 @@ _HEADER_BEGIN = '''#ifndef _{ucprefix}H #include "{bitfield_header_filename}" +{prefix_def} +{default_stream_def} + struct {prefix}ctx; uint32_t {prefix}packet_size(void *ctx); -- 2.34.1