From 721eb4dff8ded7618022383b831019d6f08d4d4a Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 16 Mar 2016 15:36:01 -0400 Subject: [PATCH] Write log level name to metadata comment if available Signed-off-by: Philippe Proulx --- barectf/config.py | 8 +++++--- barectf/metadata.py | 3 +++ barectf/tsdl182gen.py | 9 ++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/barectf/config.py b/barectf/config.py index 25d044e..114271f 100644 --- a/barectf/config.py +++ b/barectf/config.py @@ -2091,15 +2091,17 @@ class _YamlConfigParser: ll_node = event_node['log-level'] if _is_str_prop(ll_node): - ll = self._lookup_log_level(event_node['log-level']) + ll_value = self._lookup_log_level(event_node['log-level']) - if ll is None: + if ll_value is None: raise ConfigError('cannot find log level "{}"'.format(ll_node)) + + ll = metadata.LogLevel(event_node['log-level'], ll_value) elif _is_int_prop(ll_node): if ll_node < 0: raise ConfigError('invalid log level value {}: value must be positive'.format(ll_node)) - ll = ll_node + ll = metadata.LogLevel(None, ll_node) else: raise ConfigError('"log-level" property must be either a string or an integer') diff --git a/barectf/metadata.py b/barectf/metadata.py index d225bdf..e37de04 100644 --- a/barectf/metadata.py +++ b/barectf/metadata.py @@ -528,6 +528,9 @@ class Clock: self._return_ctype = value +LogLevel = collections.namedtuple('LogLevel', ['name', 'value']) + + class Event: def __init__(self): self._id = None diff --git a/barectf/tsdl182gen.py b/barectf/tsdl182gen.py index 343b692..35a515a 100644 --- a/barectf/tsdl182gen.py +++ b/barectf/tsdl182gen.py @@ -298,7 +298,14 @@ def _gen_event_block(stream, ev, cg): cg.append_cc_to_last_line(stream.name.replace('/', '')) if ev.log_level is not None: - cg.add_line('loglevel = {};'.format(ev.log_level)) + add_fmt = '' + + if ev.log_level.name is not None: + name = ev.log_level.name.replace('*/', '') + add_fmt = ' /* {} */'.format(name) + + fmt = 'loglevel = {};' + add_fmt + cg.add_line(fmt.format(ev.log_level.value)) if ev.context_type is not None: _gen_entity('context', ev.context_type, cg) -- 2.34.1