It is not necessary to support that, and it doesn't help much in
implementing component classes. To keep the support-info protocol a bit
simpler, let's make it mandatory that if you have a `group` key, it must
be a string.
Change-Id: I45aa0a6fb57727d73d9fea48fbebc04dc9c0d5f5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1977
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
}
if (bt_value_map_has_entry(query_result, "group")) {
}
if (bt_value_map_has_entry(query_result, "group")) {
- enum bt_value_type group_value_type;
-
group_value = bt_value_map_borrow_entry_value_const(query_result, "group");
BT_ASSERT(group_value);
group_value = bt_value_map_borrow_entry_value_const(query_result, "group");
BT_ASSERT(group_value);
- group_value_type = bt_value_get_type(group_value);
-
- if (group_value_type == BT_VALUE_TYPE_NULL) {
- /* Do as if no value was passed. */
- group_value = NULL;
- } else if (bt_value_get_type(group_value) != BT_VALUE_TYPE_STRING) {
+ if (bt_value_get_type(group_value) != BT_VALUE_TYPE_STRING) {
BT_LOGW("babeltrace.support-info query: unexpected type for entry `group`: "
"component-class-name=source.%s.%s, input=%s, input-type=%s, "
"expected-entry-type=%s,%s, actual-entry-type=%s",
BT_LOGW("babeltrace.support-info query: unexpected type for entry `group`: "
"component-class-name=source.%s.%s, input=%s, input-type=%s, "
"expected-entry-type=%s,%s, actual-entry-type=%s",
elif name.startswith('bbb'):
return {'weight': 0.5, 'group': 'bbb'}
elif name.startswith('ccc'):
elif name.startswith('bbb'):
return {'weight': 0.5, 'group': 'bbb'}
elif name.startswith('ccc'):
- # Try two different ways of returning "no group", and two
- # different ways of returning 1 (an int and a float).
+ # Try two different ways of returning 1 (an int and a float).
- return {'weight': 1, 'group': None}
- elif name[3] == '2':
- return {'weight': 1.0, 'group': None}
- elif name[3] == '3':
return 1
else:
return 1.0
return 1
else:
return 1.0