X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fvisitor-generate-ir.c;h=604388b4cf2e17cf005a05ca9b9ab60911280f8f;hb=24847fc77f9f6ccf2acc20141b4240a53903c08d;hp=09edde35ef228b5a1eeb277349b376dd2a9c2398;hpb=1f1f272012561fcf88f41d482ba3275cf12f5794;p=babeltrace.git diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c index 09edde35..604388b4 100644 --- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -27,9 +27,10 @@ * SOFTWARE. */ -#define BT_LOG_OUTPUT_LEVEL (ctx->log_level) +#define BT_COMP_LOG_SELF_COMP (ctx->log_cfg.self_comp) +#define BT_LOG_OUTPUT_LEVEL (ctx->log_cfg.log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/IR-VISITOR" -#include "logging/log.h" +#include "logging/comp-logging.h" #include #include @@ -42,13 +43,12 @@ #include #include #include "common/common.h" -#include "compat/uuid.h" +#include "common/uuid.h" #include "compat/endian.h" #include #include "logging.h" #include "scanner.h" -#include "parser.h" #include "ast.h" #include "decoder.h" #include "ctf-meta.h" @@ -68,7 +68,7 @@ do { \ ret = ctx_push_scope(ctx); \ if (ret) { \ - BT_LOGE_STR("Cannot push scope."); \ + BT_COMP_LOGE_STR("Cannot push scope."); \ goto error; \ } \ } while (0) @@ -160,19 +160,19 @@ enum loglevel { #define _BT_LIST_FIRST_ENTRY(_ptr, _class, _member) \ bt_list_entry((_ptr)->next, _class, _member) -#define _BT_LOGE_DUP_ATTR(_node, _attr, _entity) \ - _BT_LOGE_LINENO((_node)->lineno, \ +#define _BT_COMP_LOGE_DUP_ATTR(_node, _attr, _entity) \ + _BT_COMP_LOGE_LINENO((_node)->lineno, \ "Duplicate attribute in %s: attr-name=\"%s\"", \ _entity, _attr) -#define _BT_LOGE_NODE(_node, _msg, args...) \ - _BT_LOGE_LINENO((_node)->lineno, _msg, ## args) +#define _BT_COMP_LOGE_NODE(_node, _msg, args...) \ + _BT_COMP_LOGE_LINENO((_node)->lineno, _msg, ## args) -#define _BT_LOGW_NODE(_node, _msg, args...) \ - _BT_LOGW_LINENO((_node)->lineno, _msg, ## args) +#define _BT_COMP_LOGW_NODE(_node, _msg, args...) \ + _BT_COMP_LOGW_LINENO((_node)->lineno, _msg, ## args) -#define _BT_LOGV_NODE(_node, _msg, args...) \ - _BT_LOGV_LINENO((_node)->lineno, _msg, ## args) +#define _BT_COMP_LOGT_NODE(_node, _msg, args...) \ + _BT_COMP_LOGT_LINENO((_node)->lineno, _msg, ## args) /* * Declaration scope of a visitor context. This represents a TSDL @@ -195,8 +195,8 @@ struct ctx_decl_scope { * Visitor context (private). */ struct ctx { - bt_logging_level log_level; - bt_self_component_source *self_comp; + struct meta_log_config log_cfg; + /* Trace IR trace class being filled (owned by this) */ bt_trace_class *trace_class; @@ -235,7 +235,7 @@ struct ctx_decl_scope *ctx_decl_scope_create(struct ctx *ctx, scope = g_new(struct ctx_decl_scope, 1); if (!scope) { - BT_LOGE_STR("Failed to allocate one declaration scope."); + BT_COMP_LOGE_STR("Failed to allocate one declaration scope."); goto end; } @@ -285,7 +285,7 @@ GQuark get_prefixed_named_quark(struct ctx *ctx, char prefix, const char *name) /* Prefix character + original string + '\0' */ char *prname = g_new(char, strlen(name) + 2); if (!prname) { - BT_LOGE_STR("Failed to allocate a string."); + BT_COMP_LOGE_STR("Failed to allocate a string."); goto end; } @@ -578,8 +578,7 @@ end: * @returns New visitor context, or NULL on error */ static -struct ctx *ctx_create(bt_self_component_source *self_comp, - const struct ctf_metadata_decoder_config *decoder_config) +struct ctx *ctx_create(const struct ctf_metadata_decoder_config *decoder_config) { struct ctx *ctx = NULL; @@ -587,34 +586,34 @@ struct ctx *ctx_create(bt_self_component_source *self_comp, ctx = g_new0(struct ctx, 1); if (!ctx) { - BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, decoder_config->log_level, - BT_LOG_TAG, + BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, decoder_config->log_level, + decoder_config->self_comp, "Failed to allocate one visitor context."); goto error; } - ctx->log_level = decoder_config->log_level; + ctx->log_cfg.log_level = decoder_config->log_level; + ctx->log_cfg.self_comp = decoder_config->self_comp; - if (self_comp) { + if (decoder_config->self_comp) { ctx->trace_class = bt_trace_class_create( - bt_self_component_source_as_self_component(self_comp)); + decoder_config->self_comp); if (!ctx->trace_class) { - BT_LOGE_STR("Cannot create empty trace class."); + BT_COMP_LOGE_STR("Cannot create empty trace class."); goto error; } - ctx->self_comp = self_comp; } ctx->ctf_tc = ctf_trace_class_create(); if (!ctx->ctf_tc) { - BT_LOGE_STR("Cannot create CTF trace class."); + BT_COMP_LOGE_STR("Cannot create CTF trace class."); goto error; } /* Root declaration scope */ ctx->current_scope = ctx_decl_scope_create(ctx, NULL); if (!ctx->current_scope) { - BT_LOGE_STR("Cannot create declaration scope."); + BT_COMP_LOGE_STR("Cannot create declaration scope."); goto error; } @@ -645,7 +644,7 @@ int ctx_push_scope(struct ctx *ctx) BT_ASSERT(ctx); new_scope = ctx_decl_scope_create(ctx, ctx->current_scope); if (!new_scope) { - BT_LOGE_STR("Cannot create declaration scope."); + BT_COMP_LOGE_STR("Cannot create declaration scope."); ret = -ENOMEM; goto end; } @@ -679,61 +678,6 @@ static int visit_field_class_specifier_list(struct ctx *ctx, struct ctf_node *ts_list, struct ctf_field_class **decl); -static -char *remove_underscores_from_field_ref(struct ctx *ctx, const char *field_ref) -{ - const char *in_ch; - char *out_ch; - char *ret; - enum { - UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE, - UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE, - } state = UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE; - - BT_ASSERT(field_ref); - ret = calloc(strlen(field_ref) + 1, 1); - if (!ret) { - BT_LOGE("Failed to allocate a string: size=%zu", - strlen(field_ref) + 1); - goto end; - } - - in_ch = field_ref; - out_ch = ret; - - while (*in_ch != '\0') { - switch (*in_ch) { - case ' ': - case '\t': - /* Remove whitespace */ - in_ch++; - continue; - case '_': - if (state == UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE) { - in_ch++; - state = UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE; - continue; - } - - goto copy; - case '.': - state = UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE; - goto copy; - default: - state = UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE; - goto copy; - } - -copy: - *out_ch = *in_ch; - in_ch++; - out_ch++; - } - -end: - return ret; -} - static int is_unary_string(struct bt_list_head *head) { @@ -753,59 +697,6 @@ int is_unary_string(struct bt_list_head *head) return ret; } -static -char *concatenate_unary_strings(struct bt_list_head *head) -{ - int i = 0; - GString *str; - struct ctf_node *node; - - str = g_string_new(NULL); - BT_ASSERT(str); - - bt_list_for_each_entry(node, head, siblings) { - char *src_string; - - if ( - node->type != NODE_UNARY_EXPRESSION || - node->u.unary_expression.type != UNARY_STRING || - !( - ( - node->u.unary_expression.link != - UNARY_LINK_UNKNOWN - ) ^ (i == 0) - ) - ) { - goto error; - } - - switch (node->u.unary_expression.link) { - case UNARY_DOTLINK: - g_string_append(str, "."); - break; - case UNARY_ARROWLINK: - g_string_append(str, "->"); - break; - case UNARY_DOTDOTDOT: - g_string_append(str, "..."); - break; - default: - break; - } - - src_string = node->u.unary_expression.u.string; - g_string_append(str, src_string); - i++; - } - - /* Destroys the container, returns the underlying string */ - return g_string_free(str, FALSE); - -error: - /* This always returns NULL */ - return g_string_free(str, TRUE); -} - static const char *get_map_clock_name_value(struct bt_list_head *head) { @@ -906,7 +797,7 @@ int get_unary_unsigned(struct ctx *ctx, struct bt_list_head *head, uexpr_type != UNARY_UNSIGNED_CONSTANT || uexpr_link != UNARY_LINK_UNKNOWN || i != 0; if (cond) { - _BT_LOGE_NODE(node, "Invalid constant unsigned integer."); + _BT_COMP_LOGE_NODE(node, "Invalid constant unsigned integer."); ret = -EINVAL; goto end; } @@ -979,36 +870,10 @@ end: static int get_unary_uuid(struct ctx *ctx, struct bt_list_head *head, - unsigned char *uuid) + bt_uuid_t uuid) { - int i = 0; - int ret = 0; - struct ctf_node *node; - - bt_list_for_each_entry(node, head, siblings) { - int uexpr_type = node->u.unary_expression.type; - int uexpr_link = node->u.unary_expression.link; - const char *src_string; - - if (node->type != NODE_UNARY_EXPRESSION || - uexpr_type != UNARY_STRING || - uexpr_link != UNARY_LINK_UNKNOWN || - i != 0) { - ret = -EINVAL; - goto end; - } - - src_string = node->u.unary_expression.u.string; - ret = bt_uuid_parse(src_string, uuid); - if (ret) { - _BT_LOGE_NODE(node, - "Cannot parse UUID: uuid=\"%s\"", src_string); - goto end; - } - } - -end: - return ret; + return ctf_ast_get_unary_uuid(head, uuid, ctx->log_cfg.log_level, + ctx->log_cfg.self_comp); } static @@ -1017,7 +882,7 @@ int get_boolean(struct ctx *ctx, struct ctf_node *unary_expr) int ret = 0; if (unary_expr->type != NODE_UNARY_EXPRESSION) { - _BT_LOGE_NODE(unary_expr, + _BT_COMP_LOGE_NODE(unary_expr, "Expecting unary expression: node-type=%d", unary_expr->type); ret = -EINVAL; @@ -1035,12 +900,12 @@ int get_boolean(struct ctx *ctx, struct ctf_node *unary_expr) { const char *str = unary_expr->u.unary_expression.u.string; - if (!strcmp(str, "true") || !strcmp(str, "TRUE")) { + if (strcmp(str, "true") == 0 || strcmp(str, "TRUE") == 0) { ret = TRUE; - } else if (!strcmp(str, "false") || !strcmp(str, "FALSE")) { + } else if (strcmp(str, "false") == 0 || strcmp(str, "FALSE") == 0) { ret = FALSE; } else { - _BT_LOGE_NODE(unary_expr, + _BT_COMP_LOGE_NODE(unary_expr, "Unexpected boolean value: value=\"%s\"", str); ret = -EINVAL; goto end; @@ -1048,7 +913,7 @@ int get_boolean(struct ctx *ctx, struct ctf_node *unary_expr) break; } default: - _BT_LOGE_NODE(unary_expr, + _BT_COMP_LOGE_NODE(unary_expr, "Unexpected unary expression type: node-type=%d", unary_expr->u.unary_expression.type); ret = -EINVAL; @@ -1064,24 +929,24 @@ enum ctf_byte_order byte_order_from_unary_expr(struct ctx *ctx, struct ctf_node *unary_expr) { const char *str; - enum ctf_byte_order bo = -1; + enum ctf_byte_order bo = CTF_BYTE_ORDER_UNKNOWN; if (unary_expr->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(unary_expr, + _BT_COMP_LOGE_NODE(unary_expr, "\"byte_order\" attribute: expecting `be`, `le`, `network`, or `native`."); goto end; } str = unary_expr->u.unary_expression.u.string; - if (!strcmp(str, "be") || !strcmp(str, "network")) { + if (strcmp(str, "be") == 0 || strcmp(str, "network") == 0) { bo = CTF_BYTE_ORDER_BIG; - } else if (!strcmp(str, "le")) { + } else if (strcmp(str, "le") == 0) { bo = CTF_BYTE_ORDER_LITTLE; - } else if (!strcmp(str, "native")) { + } else if (strcmp(str, "native") == 0) { bo = CTF_BYTE_ORDER_DEFAULT; } else { - _BT_LOGE_NODE(unary_expr, + _BT_COMP_LOGE_NODE(unary_expr, "Unexpected \"byte_order\" attribute value: " "expecting `be`, `le`, `network`, or `native`: value=\"%s\"", str); @@ -1118,7 +983,7 @@ int get_class_specifier_name(struct ctx *ctx, struct ctf_node *cls_specifier, int ret = 0; if (cls_specifier->type != NODE_TYPE_SPECIFIER) { - _BT_LOGE_NODE(cls_specifier, + _BT_COMP_LOGE_NODE(cls_specifier, "Unexpected node type: node-type=%d", cls_specifier->type); ret = -EINVAL; @@ -1176,7 +1041,7 @@ int get_class_specifier_name(struct ctx *ctx, struct ctf_node *cls_specifier, struct ctf_node *node = cls_specifier->u.field_class_specifier.node; if (!node->u._struct.name) { - _BT_LOGE_NODE(node, "Unexpected empty structure field class name."); + _BT_COMP_LOGE_NODE(node, "Unexpected empty structure field class name."); ret = -EINVAL; goto end; } @@ -1190,7 +1055,7 @@ int get_class_specifier_name(struct ctx *ctx, struct ctf_node *cls_specifier, struct ctf_node *node = cls_specifier->u.field_class_specifier.node; if (!node->u.variant.name) { - _BT_LOGE_NODE(node, "Unexpected empty variant field class name."); + _BT_COMP_LOGE_NODE(node, "Unexpected empty variant field class name."); ret = -EINVAL; goto end; } @@ -1204,7 +1069,7 @@ int get_class_specifier_name(struct ctx *ctx, struct ctf_node *cls_specifier, struct ctf_node *node = cls_specifier->u.field_class_specifier.node; if (!node->u._enum.enum_id) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected empty enumeration field class (`enum`) name."); ret = -EINVAL; goto end; @@ -1218,7 +1083,7 @@ int get_class_specifier_name(struct ctx *ctx, struct ctf_node *cls_specifier, case TYPESPEC_INTEGER: case TYPESPEC_STRING: default: - _BT_LOGE_NODE(cls_specifier->u.field_class_specifier.node, + _BT_COMP_LOGE_NODE(cls_specifier->u.field_class_specifier.node, "Unexpected field class specifier type: %d", cls_specifier->u.field_class_specifier.type); ret = -EINVAL; @@ -1310,7 +1175,7 @@ int visit_field_class_declarator(struct ctx *ctx, if (node_field_class_declarator) { if (node_field_class_declarator->u.field_class_declarator.type == TYPEDEC_UNKNOWN) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Unexpected field class declarator type: type=%d", node_field_class_declarator->u.field_class_declarator.type); ret = -EINVAL; @@ -1320,7 +1185,7 @@ int visit_field_class_declarator(struct ctx *ctx, /* TODO: GCC bitfields not supported yet */ if (node_field_class_declarator->u.field_class_declarator.bitfield_len != NULL) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "GCC bitfields are not supported as of this version."); ret = -EPERM; goto error; @@ -1347,7 +1212,7 @@ int visit_field_class_declarator(struct ctx *ctx, ctx->current_scope, g_quark_to_string(qalias), -1, true); if (!nested_decl) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Cannot find class alias: name=\"%s\"", g_quark_to_string(qalias)); ret = -EINVAL; @@ -1385,10 +1250,6 @@ int visit_field_class_declarator(struct ctx *ctx, const char *id = node_field_class_declarator->u.field_class_declarator.u.id; - if (id[0] == '_') { - id++; - } - *field_name = g_quark_from_string(id); } else { *field_name = 0; @@ -1407,7 +1268,7 @@ int visit_field_class_declarator(struct ctx *ctx, /* Create array/sequence, pass nested_decl as child */ if (bt_list_empty(length)) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Expecting length field reference or value."); ret = -EINVAL; goto error; @@ -1415,7 +1276,7 @@ int visit_field_class_declarator(struct ctx *ctx, first = _BT_LIST_FIRST_ENTRY(length, struct ctf_node, siblings); if (first->type != NODE_UNARY_EXPRESSION) { - _BT_LOGE_NODE(first, + _BT_COMP_LOGE_NODE(first, "Unexpected node type: node-type=%d", first->type); ret = -EINVAL; @@ -1440,10 +1301,10 @@ int visit_field_class_declarator(struct ctx *ctx, { /* Lookup unsigned integer definition, create seq. */ struct ctf_field_class_sequence *seq_decl = NULL; - char *length_name = concatenate_unary_strings(length); + char *length_name = ctf_ast_concatenate_unary_strings(length); if (!length_name) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; @@ -1458,7 +1319,7 @@ int visit_field_class_declarator(struct ctx *ctx, struct ctf_field_class_array *array_decl; if (!env_entry) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Cannot find environment entry: " "name=\"%s\"", env_entry_name); ret = -EINVAL; @@ -1466,7 +1327,7 @@ int visit_field_class_declarator(struct ctx *ctx, } if (env_entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Wrong environment entry type " "(expecting integer): " "name=\"%s\"", env_entry_name); @@ -1475,7 +1336,7 @@ int visit_field_class_declarator(struct ctx *ctx, } if (env_entry->value.i < 0) { - _BT_LOGE_NODE(node_field_class_declarator, + _BT_COMP_LOGE_NODE(node_field_class_declarator, "Invalid, negative array length: " "env-entry-name=\"%s\", " "value=%" PRId64, @@ -1493,24 +1354,12 @@ int visit_field_class_declarator(struct ctx *ctx, nested_decl = NULL; decl = (void *) array_decl; } else { - char *length_name_no_underscore = - remove_underscores_from_field_ref(ctx, - length_name); - if (!length_name_no_underscore) { - /* - * remove_underscores_from_field_ref() - * logs errors - */ - ret = -EINVAL; - goto error; - } seq_decl = ctf_field_class_sequence_create(); BT_ASSERT(seq_decl); seq_decl->base.elem_fc = nested_decl; nested_decl = NULL; g_string_assign(seq_decl->length_ref, - length_name_no_underscore); - free(length_name_no_underscore); + length_name); decl = (void *) seq_decl; } @@ -1586,7 +1435,7 @@ int visit_struct_decl_field(struct ctx *ctx, &qfield_name, iter, &field_decl, NULL); if (ret) { BT_ASSERT(!field_decl); - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Cannot visit field class declarator: ret=%d", ret); goto error; } @@ -1597,7 +1446,7 @@ int visit_struct_decl_field(struct ctx *ctx, /* Check if field with same name already exists */ if (ctf_field_class_struct_borrow_member_by_name( struct_decl, field_name)) { - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Duplicate field in structure field class: " "field-name=\"%s\"", field_name); ret = -EINVAL; @@ -1637,7 +1486,7 @@ int visit_variant_decl_field(struct ctx *ctx, &qfield_name, iter, &field_decl, NULL); if (ret) { BT_ASSERT(!field_decl); - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Cannot visit field class declarator: ret=%d", ret); goto error; } @@ -1648,7 +1497,7 @@ int visit_variant_decl_field(struct ctx *ctx, /* Check if field with same name already exists */ if (ctf_field_class_variant_borrow_option_by_name( variant_decl, field_name)) { - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Duplicate field in variant field class: " "field-name=\"%s\"", field_name); ret = -EINVAL; @@ -1682,7 +1531,7 @@ int visit_field_class_def(struct ctx *ctx, struct ctf_node *cls_specifier_list, ret = visit_field_class_declarator(ctx, cls_specifier_list, &qidentifier, iter, &class_decl, NULL); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit field class declarator: ret=%d", ret); ret = -EINVAL; goto end; @@ -1694,7 +1543,7 @@ int visit_field_class_def(struct ctx *ctx, struct ctf_node *cls_specifier_list, (void *) class_decl; if (var_fc->tag_path.path->len == 0) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Type definition of untagged variant field class is not allowed."); ret = -EPERM; goto end; @@ -1704,7 +1553,7 @@ int visit_field_class_def(struct ctx *ctx, struct ctf_node *cls_specifier_list, ret = ctx_decl_scope_register_alias(ctx, ctx->current_scope, g_quark_to_string(qidentifier), class_decl); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot register field class alias: name=\"%s\"", g_quark_to_string(qidentifier)); goto end; @@ -1741,7 +1590,7 @@ int visit_field_class_alias(struct ctx *ctx, struct ctf_node *target, &qdummy_field_name, node, &class_decl, NULL); if (ret) { BT_ASSERT(!class_decl); - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot visit field class declarator: ret=%d", ret); goto end; } @@ -1751,7 +1600,7 @@ int visit_field_class_alias(struct ctx *ctx, struct ctf_node *target, struct ctf_field_class_variant *var_fc = (void *) class_decl; if (var_fc->tag_path.path->len == 0) { - _BT_LOGE_NODE(target, + _BT_COMP_LOGE_NODE(target, "Type definition of untagged variant field class is not allowed."); ret = -EPERM; goto end; @@ -1763,7 +1612,7 @@ int visit_field_class_alias(struct ctx *ctx, struct ctf_node *target, * abstract or not (if it has an identifier). Check it here. */ if (qdummy_field_name != 0) { - _BT_LOGE_NODE(target, + _BT_COMP_LOGE_NODE(target, "Expecting empty identifier: id=\"%s\"", g_quark_to_string(qdummy_field_name)); ret = -EINVAL; @@ -1778,7 +1627,7 @@ int visit_field_class_alias(struct ctx *ctx, struct ctf_node *target, ret = ctx_decl_scope_register_alias(ctx, ctx->current_scope, g_quark_to_string(qalias), class_decl); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot register class alias: name=\"%s\"", g_quark_to_string(qalias)); goto end; @@ -1802,7 +1651,7 @@ int visit_struct_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, entry_node->u.field_class_def.field_class_specifier_list, &entry_node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot add field class found in structure field class: ret=%d", ret); goto end; @@ -1812,7 +1661,7 @@ int visit_struct_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = visit_field_class_alias(ctx, entry_node->u.field_class_alias.target, entry_node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot add field class alias found in structure field class: ret=%d", ret); goto end; @@ -1830,7 +1679,7 @@ int visit_struct_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, } break; default: - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected node type: node-type=%d", entry_node->type); ret = -EINVAL; goto end; @@ -1852,7 +1701,7 @@ int visit_variant_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, entry_node->u.field_class_def.field_class_specifier_list, &entry_node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot add field class found in variant field class: ret=%d", ret); goto end; @@ -1862,7 +1711,7 @@ int visit_variant_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = visit_field_class_alias(ctx, entry_node->u.field_class_alias.target, entry_node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot add field class alias found in variant field class: ret=%d", ret); goto end; @@ -1880,7 +1729,7 @@ int visit_variant_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, } break; default: - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected node type: node-type=%d", entry_node->type); ret = -EINVAL; @@ -1905,7 +1754,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, /* For named struct (without body), lookup in declaration scope */ if (!has_body) { if (!name) { - BT_LOGE_STR("Bodyless structure field class: missing name."); + BT_COMP_LOGE_STR("Bodyless structure field class: missing name."); ret = -EPERM; goto error; } @@ -1913,7 +1762,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, *struct_decl = ctx_decl_scope_lookup_struct(ctx, ctx->current_scope, name, -1, true); if (!*struct_decl) { - BT_LOGE("Cannot find structure field class: name=\"struct %s\"", + BT_COMP_LOGE("Cannot find structure field class: name=\"struct %s\"", name); ret = -EINVAL; goto error; @@ -1925,7 +1774,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, if (name) { if (ctx_decl_scope_lookup_struct(ctx, ctx->current_scope, name, 1, false)) { - BT_LOGE("Structure field class already declared in local scope: " + BT_COMP_LOGE("Structure field class already declared in local scope: " "name=\"struct %s\"", name); ret = -EINVAL; goto error; @@ -1936,7 +1785,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, ret = get_unary_unsigned(ctx, min_align, &min_align_value); if (ret) { - BT_LOGE("Unexpected unary expression for structure field class's `align` attribute: " + BT_COMP_LOGE("Unexpected unary expression for structure field class's `align` attribute: " "ret=%d", ret); goto error; } @@ -1955,7 +1804,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, ret = visit_struct_decl_entry(ctx, entry_node, *struct_decl); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot visit structure field class entry: " "ret=%d", ret); ctx_pop_scope(ctx); @@ -1969,7 +1818,7 @@ int visit_struct_decl(struct ctx *ctx, const char *name, ret = ctx_decl_scope_register_struct(ctx, ctx->current_scope, name, *struct_decl); if (ret) { - BT_LOGE("Cannot register structure field class in declaration scope: " + BT_COMP_LOGE("Cannot register structure field class in declaration scope: " "name=\"struct %s\", ret=%d", name, ret); goto error; } @@ -1998,7 +1847,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, /* For named variant (without body), lookup in declaration scope */ if (!has_body) { if (!name) { - BT_LOGE_STR("Bodyless variant field class: missing name."); + BT_COMP_LOGE_STR("Bodyless variant field class: missing name."); ret = -EPERM; goto error; } @@ -2007,7 +1856,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, ctx_decl_scope_lookup_variant(ctx, ctx->current_scope, name, -1, true); if (!untagged_variant_decl) { - BT_LOGE("Cannot find variant field class: name=\"variant %s\"", + BT_COMP_LOGE("Cannot find variant field class: name=\"variant %s\"", name); ret = -EINVAL; goto error; @@ -2018,7 +1867,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, if (name) { if (ctx_decl_scope_lookup_variant(ctx, ctx->current_scope, name, 1, false)) { - BT_LOGE("Variant field class already declared in local scope: " + BT_COMP_LOGE("Variant field class already declared in local scope: " "name=\"variant %s\"", name); ret = -EINVAL; goto error; @@ -2033,7 +1882,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, ret = visit_variant_decl_entry(ctx, entry_node, untagged_variant_decl); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot visit variant field class entry: " "ret=%d", ret); ctx_pop_scope(ctx); @@ -2048,7 +1897,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, ctx->current_scope, name, untagged_variant_decl); if (ret) { - BT_LOGE("Cannot register variant field class in declaration scope: " + BT_COMP_LOGE("Cannot register variant field class in declaration scope: " "name=\"variant %s\", ret=%d", name, ret); goto error; } @@ -2067,17 +1916,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name, * At this point, we have a fresh untagged variant; nobody * else owns it. Set its tag now. */ - char *tag_no_underscore = - remove_underscores_from_field_ref(ctx, tag); - - if (!tag_no_underscore) { - /* remove_underscores_from_field_ref() logs errors */ - goto error; - } - - g_string_assign(untagged_variant_decl->tag_ref, - tag_no_underscore); - free(tag_no_underscore); + g_string_assign(untagged_variant_decl->tag_ref, tag); *variant_decl = untagged_variant_decl; untagged_variant_decl = NULL; } @@ -2118,14 +1957,13 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator, .value.u = 0, }; const char *label = enumerator->u.enumerator.id; - const char *effective_label = label; struct bt_list_head *values = &enumerator->u.enumerator.values; bt_list_for_each_entry(iter, values, siblings) { struct uori *target; if (iter->type != NODE_UNARY_EXPRESSION) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Wrong expression for enumeration field class label: " "node-type=%d, label=\"%s\"", iter->type, label); @@ -2151,7 +1989,7 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator, iter->u.unary_expression.u.unsigned_constant; break; default: - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Invalid enumeration field class entry: " "expecting constant signed or unsigned integer: " "node-type=%d, label=\"%s\"", @@ -2161,7 +1999,7 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator, } if (nr_vals > 1) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Invalid enumeration field class entry: label=\"%s\"", label); ret = -EINVAL; @@ -2185,19 +2023,7 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator, last->value.u = end.value.u + 1; } - if (label[0] == '_') { - /* - * Strip the first underscore of any enumeration field - * class's label in case this enumeration FC is used as - * a variant FC tag later. The variant FC choice names - * could also start with `_`, in which case the prefix - * is removed, and it the resulting choice name needs to - * match tag labels. - */ - effective_label = &label[1]; - } - - ctf_field_class_enum_append_mapping(enum_decl, effective_label, + ctf_field_class_enum_map_range(enum_decl, label, start.value.u, end.value.u); return 0; @@ -2221,7 +2047,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, /* For named enum (without body), lookup in declaration scope */ if (!has_body) { if (!name) { - BT_LOGE_STR("Bodyless enumeration field class: missing name."); + BT_COMP_LOGE_STR("Bodyless enumeration field class: missing name."); ret = -EPERM; goto error; } @@ -2229,7 +2055,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, *enum_decl = ctx_decl_scope_lookup_enum(ctx, ctx->current_scope, name, -1, true); if (!*enum_decl) { - BT_LOGE("Cannot find enumeration field class: " + BT_COMP_LOGE("Cannot find enumeration field class: " "name=\"enum %s\"", name); ret = -EINVAL; goto error; @@ -2244,7 +2070,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, if (name) { if (ctx_decl_scope_lookup_enum(ctx, ctx->current_scope, name, 1, false)) { - BT_LOGE("Enumeration field class already declared in local scope: " + BT_COMP_LOGE("Enumeration field class already declared in local scope: " "name=\"enum %s\"", name); ret = -EINVAL; goto error; @@ -2255,7 +2081,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, integer_decl = (void *) ctx_decl_scope_lookup_alias(ctx, ctx->current_scope, "int", -1, true); if (!integer_decl) { - BT_LOGE_STR("Cannot find implicit `int` field class alias for enumeration field class."); + BT_COMP_LOGE_STR("Cannot find implicit `int` field class alias for enumeration field class."); ret = -EINVAL; goto error; } @@ -2273,7 +2099,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, BT_ASSERT(integer_decl); if (integer_decl->base.base.type != CTF_FIELD_CLASS_TYPE_INT) { - BT_LOGE("Container field class for enumeration field class is not an integer field class: " + BT_COMP_LOGE("Container field class for enumeration field class is not an integer field class: " "fc-type=%d", integer_decl->base.base.type); ret = -EINVAL; goto error; @@ -2291,7 +2117,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, ret = visit_enum_decl_entry(ctx, iter, *enum_decl, &last_value); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit enumeration field class entry: " "ret=%d", ret); goto error; @@ -2302,7 +2128,7 @@ int visit_enum_decl(struct ctx *ctx, const char *name, ret = ctx_decl_scope_register_enum(ctx, ctx->current_scope, name, *enum_decl); if (ret) { - BT_LOGE("Cannot register enumeration field class in declaration scope: " + BT_COMP_LOGE("Cannot register enumeration field class in declaration scope: " "ret=%d", ret); goto error; } @@ -2333,7 +2159,7 @@ int visit_field_class_specifier(struct ctx *ctx, str = g_string_new(""); ret = get_class_specifier_list_name(ctx, cls_specifier_list, str); if (ret) { - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Cannot get field class specifier list's name: ret=%d", ret); goto error; } @@ -2341,7 +2167,7 @@ int visit_field_class_specifier(struct ctx *ctx, *decl = ctx_decl_scope_lookup_alias(ctx, ctx->current_scope, str->str, -1, true); if (!*decl) { - _BT_LOGE_NODE(cls_specifier_list, + _BT_COMP_LOGE_NODE(cls_specifier_list, "Cannot find field class alias: name=\"%s\"", str->str); ret = -EINVAL; goto error; @@ -2389,16 +2215,16 @@ int visit_integer_decl(struct ctx *ctx, siblings); if (left->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(left, + _BT_COMP_LOGE_NODE(left, "Unexpected unary expression type: type=%d", left->u.unary_expression.type); ret = -EINVAL; goto error; } - if (!strcmp(left->u.unary_expression.u.string, "signed")) { + if (strcmp(left->u.unary_expression.u.string, "signed") == 0) { if (_IS_SET(&set, _INTEGER_SIGNED_SET)) { - _BT_LOGE_DUP_ATTR(left, "signed", + _BT_COMP_LOGE_DUP_ATTR(left, "signed", "integer field class"); ret = -EPERM; goto error; @@ -2406,7 +2232,7 @@ int visit_integer_decl(struct ctx *ctx, signedness = get_boolean(ctx, right); if (signedness < 0) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid boolean value for integer field class's `signed` attribute: " "ret=%d", ret); ret = -EINVAL; @@ -2414,18 +2240,17 @@ int visit_integer_decl(struct ctx *ctx, } _SET(&set, _INTEGER_SIGNED_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "byte_order")) { + } else if (strcmp(left->u.unary_expression.u.string, "byte_order") == 0) { if (_IS_SET(&set, _INTEGER_BYTE_ORDER_SET)) { - _BT_LOGE_DUP_ATTR(left, "byte_order", + _BT_COMP_LOGE_DUP_ATTR(left, "byte_order", "integer field class"); ret = -EPERM; goto error; } byte_order = get_real_byte_order(ctx, right); - if (byte_order == -1) { - _BT_LOGE_NODE(right, + if (byte_order == CTF_BYTE_ORDER_UNKNOWN) { + _BT_COMP_LOGE_NODE(right, "Invalid `byte_order` attribute in integer field class: " "ret=%d", ret); ret = -EINVAL; @@ -2433,9 +2258,9 @@ int visit_integer_decl(struct ctx *ctx, } _SET(&set, _INTEGER_BYTE_ORDER_SET); - } else if (!strcmp(left->u.unary_expression.u.string, "size")) { + } else if (strcmp(left->u.unary_expression.u.string, "size") == 0) { if (_IS_SET(&set, _INTEGER_SIZE_SET)) { - _BT_LOGE_DUP_ATTR(left, "size", + _BT_COMP_LOGE_DUP_ATTR(left, "size", "integer field class"); ret = -EPERM; goto error; @@ -2443,7 +2268,7 @@ int visit_integer_decl(struct ctx *ctx, if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `size` attribute in integer field class: " "expecting unsigned constant integer: " "node-type=%d", @@ -2454,14 +2279,14 @@ int visit_integer_decl(struct ctx *ctx, size = right->u.unary_expression.u.unsigned_constant; if (size == 0) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `size` attribute in integer field class: " "expecting positive constant integer: " "size=%" PRIu64, size); ret = -EINVAL; goto error; } else if (size > 64) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `size` attribute in integer field class: " "integer fields over 64 bits are not supported as of this version: " "size=%" PRIu64, size); @@ -2470,10 +2295,9 @@ int visit_integer_decl(struct ctx *ctx, } _SET(&set, _INTEGER_SIZE_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "align")) { + } else if (strcmp(left->u.unary_expression.u.string, "align") == 0) { if (_IS_SET(&set, _INTEGER_ALIGN_SET)) { - _BT_LOGE_DUP_ATTR(left, "align", + _BT_COMP_LOGE_DUP_ATTR(left, "align", "integer field class"); ret = -EPERM; goto error; @@ -2481,7 +2305,7 @@ int visit_integer_decl(struct ctx *ctx, if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `align` attribute in integer field class: " "expecting unsigned constant integer: " "node-type=%d", @@ -2493,7 +2317,7 @@ int visit_integer_decl(struct ctx *ctx, alignment = right->u.unary_expression.u.unsigned_constant; if (!is_align_valid(alignment)) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `align` attribute in integer field class: " "expecting power of two: " "align=%" PRIu64, alignment); @@ -2502,9 +2326,9 @@ int visit_integer_decl(struct ctx *ctx, } _SET(&set, _INTEGER_ALIGN_SET); - } else if (!strcmp(left->u.unary_expression.u.string, "base")) { + } else if (strcmp(left->u.unary_expression.u.string, "base") == 0) { if (_IS_SET(&set, _INTEGER_BASE_SET)) { - _BT_LOGE_DUP_ATTR(left, "base", + _BT_COMP_LOGE_DUP_ATTR(left, "base", "integer field class"); ret = -EPERM; goto error; @@ -2530,7 +2354,7 @@ int visit_integer_decl(struct ctx *ctx, base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL; break; default: - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `base` attribute in integer field class: " "base=%" PRIu64, right->u.unary_expression.u.unsigned_constant); @@ -2541,36 +2365,36 @@ int visit_integer_decl(struct ctx *ctx, } case UNARY_STRING: { - char *s_right = concatenate_unary_strings( + char *s_right = ctf_ast_concatenate_unary_strings( &expression->u.ctf_expression.right); if (!s_right) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Unexpected unary expression for integer field class's `base` attribute."); ret = -EINVAL; goto error; } - if (!strcmp(s_right, "decimal") || - !strcmp(s_right, "dec") || - !strcmp(s_right, "d") || - !strcmp(s_right, "i") || - !strcmp(s_right, "u")) { + if (strcmp(s_right, "decimal") == 0 || + strcmp(s_right, "dec") == 0 || + strcmp(s_right, "d") == 0 || + strcmp(s_right, "i") == 0 || + strcmp(s_right, "u") == 0) { base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL; - } else if (!strcmp(s_right, "hexadecimal") || - !strcmp(s_right, "hex") || - !strcmp(s_right, "x") || - !strcmp(s_right, "X") || - !strcmp(s_right, "p")) { + } else if (strcmp(s_right, "hexadecimal") == 0 || + strcmp(s_right, "hex") == 0 || + strcmp(s_right, "x") == 0 || + strcmp(s_right, "X") == 0 || + strcmp(s_right, "p") == 0) { base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL; - } else if (!strcmp(s_right, "octal") || - !strcmp(s_right, "oct") || - !strcmp(s_right, "o")) { + } else if (strcmp(s_right, "octal") == 0 || + strcmp(s_right, "oct") == 0 || + strcmp(s_right, "o") == 0) { base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL; - } else if (!strcmp(s_right, "binary") || - !strcmp(s_right, "b")) { + } else if (strcmp(s_right, "binary") == 0 || + strcmp(s_right, "b") == 0) { base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY; } else { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Unexpected unary expression for integer field class's `base` attribute: " "base=\"%s\"", s_right); g_free(s_right); @@ -2582,7 +2406,7 @@ int visit_integer_decl(struct ctx *ctx, break; } default: - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `base` attribute in integer field class: " "expecting unsigned constant integer or unary string."); ret = -EINVAL; @@ -2590,45 +2414,44 @@ int visit_integer_decl(struct ctx *ctx, } _SET(&set, _INTEGER_BASE_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "encoding")) { + } else if (strcmp(left->u.unary_expression.u.string, "encoding") == 0) { char *s_right; if (_IS_SET(&set, _INTEGER_ENCODING_SET)) { - _BT_LOGE_DUP_ATTR(left, "encoding", + _BT_COMP_LOGE_DUP_ATTR(left, "encoding", "integer field class"); ret = -EPERM; goto error; } if (right->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `encoding` attribute in integer field class: " "expecting unary string."); ret = -EINVAL; goto error; } - s_right = concatenate_unary_strings( + s_right = ctf_ast_concatenate_unary_strings( &expression->u.ctf_expression.right); if (!s_right) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Unexpected unary expression for integer field class's `encoding` attribute."); ret = -EINVAL; goto error; } - if (!strcmp(s_right, "UTF8") || - !strcmp(s_right, "utf8") || - !strcmp(s_right, "utf-8") || - !strcmp(s_right, "UTF-8") || - !strcmp(s_right, "ASCII") || - !strcmp(s_right, "ascii")) { + if (strcmp(s_right, "UTF8") == 0 || + strcmp(s_right, "utf8") == 0 || + strcmp(s_right, "utf-8") == 0 || + strcmp(s_right, "UTF-8") == 0 || + strcmp(s_right, "ASCII") == 0 || + strcmp(s_right, "ascii") == 0) { encoding = CTF_ENCODING_UTF8; - } else if (!strcmp(s_right, "none")) { + } else if (strcmp(s_right, "none") == 0) { encoding = CTF_ENCODING_NONE; } else { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `encoding` attribute in integer field class: " "unknown encoding: encoding=\"%s\"", s_right); @@ -2639,18 +2462,18 @@ int visit_integer_decl(struct ctx *ctx, g_free(s_right); _SET(&set, _INTEGER_ENCODING_SET); - } else if (!strcmp(left->u.unary_expression.u.string, "map")) { + } else if (strcmp(left->u.unary_expression.u.string, "map") == 0) { const char *clock_name; if (_IS_SET(&set, _INTEGER_MAP_SET)) { - _BT_LOGE_DUP_ATTR(left, "map", + _BT_COMP_LOGE_DUP_ATTR(left, "map", "integer field class"); ret = -EPERM; goto error; } if (right->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `map` attribute in integer field class: " "expecting unary string."); ret = -EINVAL; @@ -2661,17 +2484,17 @@ int visit_integer_decl(struct ctx *ctx, get_map_clock_name_value( &expression->u.ctf_expression.right); if (!clock_name) { - char *s_right = concatenate_unary_strings( + char *s_right = ctf_ast_concatenate_unary_strings( &expression->u.ctf_expression.right); if (!s_right) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Unexpected unary expression for integer field class's `map` attribute."); ret = -EINVAL; goto error; } - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `map` attribute in integer field class: " "cannot find clock class at this point: name=\"%s\"", s_right); @@ -2684,7 +2507,7 @@ int visit_integer_decl(struct ctx *ctx, ctf_trace_class_borrow_clock_class_by_name( ctx->ctf_tc, clock_name); if (!mapped_clock_class) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `map` attribute in integer field class: " "cannot find clock class at this point: name=\"%s\"", clock_name); @@ -2694,7 +2517,7 @@ int visit_integer_decl(struct ctx *ctx, _SET(&set, _INTEGER_MAP_SET); } else { - _BT_LOGW_NODE(left, + _BT_COMP_LOGW_NODE(left, "Unknown attribute in integer field class: " "attr-name=\"%s\"", left->u.unary_expression.u.string); @@ -2702,7 +2525,7 @@ int visit_integer_decl(struct ctx *ctx, } if (!_IS_SET(&set, _INTEGER_SIZE_SET)) { - BT_LOGE_STR("Missing `size` attribute in integer field class."); + BT_COMP_LOGE_STR("Missing `size` attribute in integer field class."); ret = -EPERM; goto error; } @@ -2757,24 +2580,24 @@ int visit_floating_point_number_decl(struct ctx *ctx, siblings); if (left->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(left, + _BT_COMP_LOGE_NODE(left, "Unexpected unary expression type: type=%d", left->u.unary_expression.type); ret = -EINVAL; goto error; } - if (!strcmp(left->u.unary_expression.u.string, "byte_order")) { + if (strcmp(left->u.unary_expression.u.string, "byte_order") == 0) { if (_IS_SET(&set, _FLOAT_BYTE_ORDER_SET)) { - _BT_LOGE_DUP_ATTR(left, "byte_order", + _BT_COMP_LOGE_DUP_ATTR(left, "byte_order", "floating point number field class"); ret = -EPERM; goto error; } byte_order = get_real_byte_order(ctx, right); - if (byte_order == -1) { - _BT_LOGE_NODE(right, + if (byte_order == CTF_BYTE_ORDER_UNKNOWN) { + _BT_COMP_LOGE_NODE(right, "Invalid `byte_order` attribute in floating point number field class: " "ret=%d", ret); ret = -EINVAL; @@ -2782,10 +2605,9 @@ int visit_floating_point_number_decl(struct ctx *ctx, } _SET(&set, _FLOAT_BYTE_ORDER_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "exp_dig")) { + } else if (strcmp(left->u.unary_expression.u.string, "exp_dig") == 0) { if (_IS_SET(&set, _FLOAT_EXP_DIG_SET)) { - _BT_LOGE_DUP_ATTR(left, "exp_dig", + _BT_COMP_LOGE_DUP_ATTR(left, "exp_dig", "floating point number field class"); ret = -EPERM; goto error; @@ -2793,7 +2615,7 @@ int visit_floating_point_number_decl(struct ctx *ctx, if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `exp_dig` attribute in floating point number field class: " "expecting unsigned constant integer: " "node-type=%d", @@ -2804,10 +2626,9 @@ int visit_floating_point_number_decl(struct ctx *ctx, exp_dig = right->u.unary_expression.u.unsigned_constant; _SET(&set, _FLOAT_EXP_DIG_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "mant_dig")) { + } else if (strcmp(left->u.unary_expression.u.string, "mant_dig") == 0) { if (_IS_SET(&set, _FLOAT_MANT_DIG_SET)) { - _BT_LOGE_DUP_ATTR(left, "mant_dig", + _BT_COMP_LOGE_DUP_ATTR(left, "mant_dig", "floating point number field class"); ret = -EPERM; goto error; @@ -2815,7 +2636,7 @@ int visit_floating_point_number_decl(struct ctx *ctx, if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `mant_dig` attribute in floating point number field class: " "expecting unsigned constant integer: " "node-type=%d", @@ -2827,10 +2648,9 @@ int visit_floating_point_number_decl(struct ctx *ctx, mant_dig = right->u.unary_expression.u. unsigned_constant; _SET(&set, _FLOAT_MANT_DIG_SET); - } else if (!strcmp(left->u.unary_expression.u.string, - "align")) { + } else if (strcmp(left->u.unary_expression.u.string, "align") == 0) { if (_IS_SET(&set, _FLOAT_ALIGN_SET)) { - _BT_LOGE_DUP_ATTR(left, "align", + _BT_COMP_LOGE_DUP_ATTR(left, "align", "floating point number field class"); ret = -EPERM; goto error; @@ -2838,7 +2658,7 @@ int visit_floating_point_number_decl(struct ctx *ctx, if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `align` attribute in floating point number field class: " "expecting unsigned constant integer: " "node-type=%d", @@ -2851,7 +2671,7 @@ int visit_floating_point_number_decl(struct ctx *ctx, unsigned_constant; if (!is_align_valid(alignment)) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `align` attribute in floating point number field class: " "expecting power of two: " "align=%" PRIu64, alignment); @@ -2861,7 +2681,7 @@ int visit_floating_point_number_decl(struct ctx *ctx, _SET(&set, _FLOAT_ALIGN_SET); } else { - _BT_LOGW_NODE(left, + _BT_COMP_LOGW_NODE(left, "Unknown attribute in floating point number field class: " "attr-name=\"%s\"", left->u.unary_expression.u.string); @@ -2869,31 +2689,31 @@ int visit_floating_point_number_decl(struct ctx *ctx, } if (!_IS_SET(&set, _FLOAT_MANT_DIG_SET)) { - BT_LOGE_STR("Missing `mant_dig` attribute in floating point number field class."); + BT_COMP_LOGE_STR("Missing `mant_dig` attribute in floating point number field class."); ret = -EPERM; goto error; } if (!_IS_SET(&set, _FLOAT_EXP_DIG_SET)) { - BT_LOGE_STR("Missing `exp_dig` attribute in floating point number field class."); + BT_COMP_LOGE_STR("Missing `exp_dig` attribute in floating point number field class."); ret = -EPERM; goto error; } if (mant_dig != 24 && mant_dig != 53) { - BT_LOGE_STR("`mant_dig` attribute: expecting 24 or 53."); + BT_COMP_LOGE_STR("`mant_dig` attribute: expecting 24 or 53."); ret = -EPERM; goto error; } if (mant_dig == 24 && exp_dig != 8) { - BT_LOGE_STR("`exp_dig` attribute: expecting 8 because `mant_dig` is 24."); + BT_COMP_LOGE_STR("`exp_dig` attribute: expecting 8 because `mant_dig` is 24."); ret = -EPERM; goto error; } if (mant_dig == 53 && exp_dig != 11) { - BT_LOGE_STR("`exp_dig` attribute: expecting 11 because `mant_dig` is 53."); + BT_COMP_LOGE_STR("`exp_dig` attribute: expecting 11 because `mant_dig` is 53."); ret = -EPERM; goto error; } @@ -2943,51 +2763,51 @@ int visit_string_decl(struct ctx *ctx, siblings); if (left->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(left, + _BT_COMP_LOGE_NODE(left, "Unexpected unary expression type: type=%d", left->u.unary_expression.type); ret = -EINVAL; goto error; } - if (!strcmp(left->u.unary_expression.u.string, "encoding")) { + if (strcmp(left->u.unary_expression.u.string, "encoding") == 0) { char *s_right; if (_IS_SET(&set, _STRING_ENCODING_SET)) { - _BT_LOGE_DUP_ATTR(left, "encoding", + _BT_COMP_LOGE_DUP_ATTR(left, "encoding", "string field class"); ret = -EPERM; goto error; } if (right->u.unary_expression.type != UNARY_STRING) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `encoding` attribute in string field class: " "expecting unary string."); ret = -EINVAL; goto error; } - s_right = concatenate_unary_strings( + s_right = ctf_ast_concatenate_unary_strings( &expression->u.ctf_expression.right); if (!s_right) { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Unexpected unary expression for string field class's `encoding` attribute."); ret = -EINVAL; goto error; } - if (!strcmp(s_right, "UTF8") || - !strcmp(s_right, "utf8") || - !strcmp(s_right, "utf-8") || - !strcmp(s_right, "UTF-8") || - !strcmp(s_right, "ASCII") || - !strcmp(s_right, "ascii")) { + if (strcmp(s_right, "UTF8") == 0 || + strcmp(s_right, "utf8") == 0 || + strcmp(s_right, "utf-8") == 0 || + strcmp(s_right, "UTF-8") == 0 || + strcmp(s_right, "ASCII") == 0 || + strcmp(s_right, "ascii") == 0) { encoding = CTF_ENCODING_UTF8; - } else if (!strcmp(s_right, "none")) { + } else if (strcmp(s_right, "none") == 0) { encoding = CTF_ENCODING_NONE; } else { - _BT_LOGE_NODE(right, + _BT_COMP_LOGE_NODE(right, "Invalid `encoding` attribute in string field class: " "unknown encoding: encoding=\"%s\"", s_right); @@ -2999,7 +2819,7 @@ int visit_string_decl(struct ctx *ctx, g_free(s_right); _SET(&set, _STRING_ENCODING_SET); } else { - _BT_LOGW_NODE(left, + _BT_COMP_LOGW_NODE(left, "Unknown attribute in string field class: " "attr-name=\"%s\"", left->u.unary_expression.u.string); @@ -3027,7 +2847,7 @@ int visit_field_class_specifier_list(struct ctx *ctx, *decl = NULL; if (ts_list->type != NODE_TYPE_SPECIFIER_LIST) { - _BT_LOGE_NODE(ts_list, + _BT_COMP_LOGE_NODE(ts_list, "Unexpected node type: node-type=%d", ts_list->type); ret = -EINVAL; goto error; @@ -3036,7 +2856,7 @@ int visit_field_class_specifier_list(struct ctx *ctx, first = _BT_LIST_FIRST_ENTRY(&ts_list->u.field_class_specifier_list.head, struct ctf_node, siblings); if (first->type != NODE_TYPE_SPECIFIER) { - _BT_LOGE_NODE(first, + _BT_COMP_LOGE_NODE(first, "Unexpected node type: node-type=%d", first->type); ret = -EINVAL; goto error; @@ -3115,7 +2935,7 @@ int visit_field_class_specifier_list(struct ctx *ctx, case TYPESPEC_ID_TYPE: ret = visit_field_class_specifier(ctx, ts_list, decl); if (ret) { - _BT_LOGE_NODE(first, + _BT_COMP_LOGE_NODE(first, "Cannot visit field class specifier: ret=%d", ret); BT_ASSERT(!*decl); @@ -3123,7 +2943,7 @@ int visit_field_class_specifier_list(struct ctx *ctx, } break; default: - _BT_LOGE_NODE(first, + _BT_COMP_LOGE_NODE(first, "Unexpected field class specifier type: node-type=%d", first->u.field_class_specifier.type); ret = -EINVAL; @@ -3152,7 +2972,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = visit_field_class_def(ctx, node->u.field_class_def.field_class_specifier_list, &node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class found in event class."); goto error; } @@ -3161,34 +2981,34 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = visit_field_class_alias(ctx, node->u.field_class_alias.target, node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class alias found in event class."); goto error; } break; case NODE_CTF_EXPRESSION: { - left = concatenate_unary_strings(&node->u.ctf_expression.left); + left = ctf_ast_concatenate_unary_strings(&node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(node, "Cannot concatenate unary strings."); + _BT_COMP_LOGE_NODE(node, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; } - if (!strcmp(left, "name")) { + if (strcmp(left, "name") == 0) { /* This is already known at this stage */ if (_IS_SET(set, _EVENT_NAME_SET)) { - _BT_LOGE_DUP_ATTR(node, "name", "event class"); + _BT_COMP_LOGE_DUP_ATTR(node, "name", "event class"); ret = -EPERM; goto error; } _SET(set, _EVENT_NAME_SET); - } else if (!strcmp(left, "id")) { + } else if (strcmp(left, "id") == 0) { int64_t id = -1; if (_IS_SET(set, _EVENT_ID_SET)) { - _BT_LOGE_DUP_ATTR(node, "id", "event class"); + _BT_COMP_LOGE_DUP_ATTR(node, "id", "event class"); ret = -EPERM; goto error; } @@ -3198,7 +3018,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, (uint64_t *) &id); /* Only read "id" if get_unary_unsigned() succeeded. */ if (ret || (!ret && id < 0)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for event class's `id` attribute."); ret = -EINVAL; goto error; @@ -3206,9 +3026,9 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, event_class->id = id; _SET(set, _EVENT_ID_SET); - } else if (!strcmp(left, "stream_id")) { + } else if (strcmp(left, "stream_id") == 0) { if (_IS_SET(set, _EVENT_STREAM_ID_SET)) { - _BT_LOGE_DUP_ATTR(node, "stream_id", + _BT_COMP_LOGE_DUP_ATTR(node, "stream_id", "event class"); ret = -EPERM; goto error; @@ -3222,16 +3042,16 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, * succeeded. */ if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for event class's `stream_id` attribute."); ret = -EINVAL; goto error; } _SET(set, _EVENT_STREAM_ID_SET); - } else if (!strcmp(left, "context")) { + } else if (strcmp(left, "context") == 0) { if (_IS_SET(set, _EVENT_CONTEXT_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `context` entry in event class."); ret = -EPERM; goto error; @@ -3243,16 +3063,16 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, struct ctf_node, siblings), &event_class->spec_context_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create event class's context field class."); goto error; } BT_ASSERT(event_class->spec_context_fc); _SET(set, _EVENT_CONTEXT_SET); - } else if (!strcmp(left, "fields")) { + } else if (strcmp(left, "fields") == 0) { if (_IS_SET(set, _EVENT_FIELDS_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `fields` entry in event class."); ret = -EPERM; goto error; @@ -3264,19 +3084,20 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, struct ctf_node, siblings), &event_class->payload_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create event class's payload field class."); goto error; } BT_ASSERT(event_class->payload_fc); _SET(set, _EVENT_FIELDS_SET); - } else if (!strcmp(left, "loglevel")) { + } else if (strcmp(left, "loglevel") == 0) { uint64_t loglevel_value; + bool is_log_level_known = true; bt_event_class_log_level log_level = -1; if (_IS_SET(set, _EVENT_LOG_LEVEL_SET)) { - _BT_LOGE_DUP_ATTR(node, "loglevel", + _BT_COMP_LOGE_DUP_ATTR(node, "loglevel", "event class"); ret = -EPERM; goto error; @@ -3285,7 +3106,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = get_unary_unsigned(ctx, &node->u.ctf_expression.right, &loglevel_value); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for event class's `loglevel` attribute."); ret = -EINVAL; goto error; @@ -3338,36 +3159,37 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, log_level = BT_EVENT_CLASS_LOG_LEVEL_DEBUG; break; default: - _BT_LOGW_NODE(node, "Not setting event class's log level because its value is unknown: " + is_log_level_known = false; + _BT_COMP_LOGW_NODE(node, "Not setting event class's log level because its value is unknown: " "log-level=%" PRIu64, loglevel_value); } - if (log_level != -1) { - event_class->log_level = log_level; + if (is_log_level_known) { + ctf_event_class_set_log_level(event_class, log_level); } _SET(set, _EVENT_LOG_LEVEL_SET); - } else if (!strcmp(left, "model.emf.uri")) { + } else if (strcmp(left, "model.emf.uri") == 0) { char *right; if (_IS_SET(set, _EVENT_MODEL_EMF_URI_SET)) { - _BT_LOGE_DUP_ATTR(node, "model.emf.uri", + _BT_COMP_LOGE_DUP_ATTR(node, "model.emf.uri", "event class"); ret = -EPERM; goto error; } - right = concatenate_unary_strings( + right = ctf_ast_concatenate_unary_strings( &node->u.ctf_expression.right); if (!right) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for event class's `model.emf.uri` attribute."); ret = -EINVAL; goto error; } if (strlen(right) == 0) { - _BT_LOGW_NODE(node, + _BT_COMP_LOGW_NODE(node, "Not setting event class's EMF URI because it's empty."); } else { g_string_assign(event_class->emf_uri, @@ -3377,7 +3199,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, g_free(right); _SET(set, _EVENT_MODEL_EMF_URI_SET); } else { - _BT_LOGW_NODE(node, + _BT_COMP_LOGW_NODE(node, "Unknown attribute in event class: " "attr-name=\"%s\"", left); } @@ -3394,9 +3216,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node, goto end; error: - if (left) { - g_free(left); - } + g_free(left); end: return ret; @@ -3415,18 +3235,18 @@ char *get_event_decl_name(struct ctx *ctx, struct ctf_node *node) continue; } - left = concatenate_unary_strings(&iter->u.ctf_expression.left); + left = ctf_ast_concatenate_unary_strings(&iter->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot concatenate unary strings."); goto error; } - if (!strcmp(left, "name")) { - name = concatenate_unary_strings( + if (strcmp(left, "name") == 0) { + name = ctf_ast_concatenate_unary_strings( &iter->u.ctf_expression.right); if (!name) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Unexpected unary expression for event class's `name` attribute."); goto error; } @@ -3467,7 +3287,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) node->visited = TRUE; event_name = get_event_decl_name(ctx, node); if (!event_name) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `name` attribute in event class."); ret = -EPERM; goto error; @@ -3483,7 +3303,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) ret = visit_event_decl_entry(ctx, iter, event_class, &stream_id, &set); if (ret) { - _BT_LOGE_NODE(iter, "Cannot visit event class's entry: " + _BT_COMP_LOGE_NODE(iter, "Cannot visit event class's entry: " "ret=%d", ret); goto error; } @@ -3510,7 +3330,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) stream_id = stream_class->id; break; default: - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `stream_id` attribute in event class."); ret = -EPERM; goto error; @@ -3522,7 +3342,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) stream_class = ctf_trace_class_borrow_stream_class_by_id( ctx->ctf_tc, stream_id); if (!stream_class) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot find stream class at this point: " "id=%" PRId64, stream_id); ret = -EINVAL; @@ -3535,7 +3355,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) if (!_IS_SET(&set, _EVENT_ID_SET)) { /* Allow only one event without ID per stream */ if (stream_class->event_classes->len != 0) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `id` attribute in event class."); ret = -EPERM; goto error; @@ -3547,7 +3367,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) if (ctf_stream_class_borrow_event_class_by_id(stream_class, event_class->id)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate event class (same ID) in the same stream class: " "id=%" PRId64, event_class->id); ret = -EEXIST; @@ -3571,9 +3391,7 @@ end: ctx_pop_scope(ctx); } - if (event_name) { - g_free(event_name); - } + g_free(event_name); return ret; } @@ -3630,7 +3448,7 @@ int auto_map_field_to_trace_clock_class(struct ctx *ctx, * Timestamp field not mapped to a clock class and there's more * than one clock class in the trace: this is an error. */ - BT_LOGE_STR("Timestamp field found with no mapped clock class, " + BT_COMP_LOGE_STR("Timestamp field found with no mapped clock class, " "but there's more than one clock class in the trace at this point."); ret = -1; goto end; @@ -3676,13 +3494,15 @@ int auto_map_fields_to_trace_clock_class(struct ctx *ctx, } else if (root_fc->type == CTF_FIELD_CLASS_TYPE_VARIANT) { named_fc = ctf_field_class_variant_borrow_option_by_index( var_fc, i); + } else { + bt_common_abort(); } if (strcmp(named_fc->name->str, field_name) == 0) { ret = auto_map_field_to_trace_clock_class(ctx, named_fc->fc); if (ret) { - BT_LOGE("Cannot automatically map field to trace's clock class: " + BT_COMP_LOGE("Cannot automatically map field to trace's clock class: " "field-name=\"%s\"", field_name); goto end; } @@ -3691,7 +3511,7 @@ int auto_map_fields_to_trace_clock_class(struct ctx *ctx, ret = auto_map_fields_to_trace_clock_class(ctx, named_fc->fc, field_name); if (ret) { - BT_LOGE("Cannot automatically map structure or variant field class's fields to trace's clock class: " + BT_COMP_LOGE("Cannot automatically map structure or variant field class's fields to trace's clock class: " "field-name=\"%s\", root-field-name=\"%s\"", field_name, named_fc->name->str); goto end; @@ -3714,7 +3534,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = visit_field_class_def(ctx, node->u.field_class_def.field_class_specifier_list, &node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class found in stream class."); goto error; } @@ -3723,25 +3543,25 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = visit_field_class_alias(ctx, node->u.field_class_alias.target, node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class alias found in stream class."); goto error; } break; case NODE_CTF_EXPRESSION: { - left = concatenate_unary_strings(&node->u.ctf_expression.left); + left = ctf_ast_concatenate_unary_strings(&node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(node, "Cannot concatenate unary strings."); + _BT_COMP_LOGE_NODE(node, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; } - if (!strcmp(left, "id")) { + if (strcmp(left, "id") == 0) { int64_t id; if (_IS_SET(set, _STREAM_ID_SET)) { - _BT_LOGE_DUP_ATTR(node, "id", + _BT_COMP_LOGE_DUP_ATTR(node, "id", "stream declaration"); ret = -EPERM; goto error; @@ -3753,7 +3573,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, /* Only read "id" if get_unary_unsigned() succeeded. */ if (ret || (!ret && id < 0)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for stream class's `id` attribute."); ret = -EINVAL; goto error; @@ -3761,7 +3581,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, if (ctf_trace_class_borrow_stream_class_by_id( ctx->ctf_tc, id)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate stream class (same ID): id=%" PRId64, id); ret = -EEXIST; @@ -3770,9 +3590,9 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, stream_class->id = id; _SET(set, _STREAM_ID_SET); - } else if (!strcmp(left, "event.header")) { + } else if (strcmp(left, "event.header") == 0) { if (_IS_SET(set, _STREAM_EVENT_HEADER_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `event.header` entry in stream class."); ret = -EPERM; goto error; @@ -3784,7 +3604,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, struct ctf_node, siblings), &stream_class->event_header_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create stream class's event header field class."); goto error; } @@ -3793,15 +3613,15 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, ret = auto_map_fields_to_trace_clock_class(ctx, stream_class->event_header_fc, "timestamp"); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot automatically map specific event header field class fields named `timestamp` to trace's clock class."); goto error; } _SET(set, _STREAM_EVENT_HEADER_SET); - } else if (!strcmp(left, "event.context")) { + } else if (strcmp(left, "event.context") == 0) { if (_IS_SET(set, _STREAM_EVENT_CONTEXT_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `event.context` entry in stream class."); ret = -EPERM; goto error; @@ -3813,16 +3633,16 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, struct ctf_node, siblings), &stream_class->event_common_context_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create stream class's event context field class."); goto error; } BT_ASSERT(stream_class->event_common_context_fc); _SET(set, _STREAM_EVENT_CONTEXT_SET); - } else if (!strcmp(left, "packet.context")) { + } else if (strcmp(left, "packet.context") == 0) { if (_IS_SET(set, _STREAM_PACKET_CONTEXT_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `packet.context` entry in stream class."); ret = -EPERM; goto error; @@ -3834,7 +3654,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, struct ctf_node, siblings), &stream_class->packet_context_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create stream class's packet context field class."); goto error; } @@ -3844,7 +3664,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, stream_class->packet_context_fc, "timestamp_begin"); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot automatically map specific packet context field class fields named `timestamp_begin` to trace's clock class."); goto error; } @@ -3853,14 +3673,14 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node, stream_class->packet_context_fc, "timestamp_end"); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot automatically map specific packet context field class fields named `timestamp_end` to trace's clock class."); goto error; } _SET(set, _STREAM_PACKET_CONTEXT_SET); } else { - _BT_LOGW_NODE(node, + _BT_COMP_LOGW_NODE(node, "Unknown attribute in stream class: " "attr-name=\"%s\"", left); } @@ -3903,7 +3723,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) bt_list_for_each_entry(iter, decl_list, siblings) { ret = visit_stream_decl_entry(ctx, iter, stream_class, &set); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit stream class's entry: " "ret=%d", ret); ctx_pop_scope(ctx); @@ -3918,7 +3738,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) struct ctf_named_field_class *named_fc = NULL; if (!ctx->ctf_tc->packet_header_fc) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Stream class has a `id` attribute, " "but trace has no packet header field class."); goto error; @@ -3927,7 +3747,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) named_fc = ctf_field_class_struct_borrow_member_by_name( (void *) ctx->ctf_tc->packet_header_fc, "stream_id"); if (!named_fc) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Stream class has a `id` attribute, " "but trace's packet header field class has no `stream_id` field."); goto error; @@ -3935,7 +3755,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) if (named_fc->fc->type != CTF_FIELD_CLASS_TYPE_INT && named_fc->fc->type != CTF_FIELD_CLASS_TYPE_ENUM) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Stream class has a `id` attribute, " "but trace's packet header field class's `stream_id` field is not an integer field class."); goto error; @@ -3943,7 +3763,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) } else { /* Allow only _one_ ID-less stream */ if (ctx->ctf_tc->stream_classes->len != 0) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `id` attribute in stream class as there's more than one stream class in the trace."); ret = -EPERM; goto error; @@ -3959,7 +3779,7 @@ int visit_stream_decl(struct ctx *ctx, struct ctf_node *node) */ if (ctf_trace_class_borrow_stream_class_by_id(ctx->ctf_tc, stream_class->id)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate stream class (same ID): id=%" PRId64, stream_class->id); ret = -EINVAL; @@ -3990,7 +3810,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) ret = visit_field_class_def(ctx, node->u.field_class_def.field_class_specifier_list, &node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class found in trace (`trace` block)."); goto error; } @@ -3999,23 +3819,23 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) ret = visit_field_class_alias(ctx, node->u.field_class_alias.target, node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot add field class alias found in trace (`trace` block)."); goto error; } break; case NODE_CTF_EXPRESSION: { - left = concatenate_unary_strings(&node->u.ctf_expression.left); + left = ctf_ast_concatenate_unary_strings(&node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(node, "Cannot concatenate unary strings."); + _BT_COMP_LOGE_NODE(node, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; } - if (!strcmp(left, "major")) { + if (strcmp(left, "major") == 0) { if (_IS_SET(set, _TRACE_MAJOR_SET)) { - _BT_LOGE_DUP_ATTR(node, "major", "trace"); + _BT_COMP_LOGE_DUP_ATTR(node, "major", "trace"); ret = -EPERM; goto error; } @@ -4023,23 +3843,23 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) ret = get_unary_unsigned(ctx, &node->u.ctf_expression.right, &val); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for trace's `major` attribute."); ret = -EINVAL; goto error; } if (val != 1) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Invalid trace's `minor` attribute: expecting 1."); goto error; } ctx->ctf_tc->major = val; _SET(set, _TRACE_MAJOR_SET); - } else if (!strcmp(left, "minor")) { + } else if (strcmp(left, "minor") == 0) { if (_IS_SET(set, _TRACE_MINOR_SET)) { - _BT_LOGE_DUP_ATTR(node, "minor", "trace"); + _BT_COMP_LOGE_DUP_ATTR(node, "minor", "trace"); ret = -EPERM; goto error; } @@ -4047,23 +3867,23 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) ret = get_unary_unsigned(ctx, &node->u.ctf_expression.right, &val); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected unary expression for trace's `minor` attribute."); ret = -EINVAL; goto error; } if (val != 8) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Invalid trace's `minor` attribute: expecting 8."); goto error; } ctx->ctf_tc->minor = val; _SET(set, _TRACE_MINOR_SET); - } else if (!strcmp(left, "uuid")) { + } else if (strcmp(left, "uuid") == 0) { if (_IS_SET(set, _TRACE_UUID_SET)) { - _BT_LOGE_DUP_ATTR(node, "uuid", "trace"); + _BT_COMP_LOGE_DUP_ATTR(node, "uuid", "trace"); ret = -EPERM; goto error; } @@ -4072,27 +3892,27 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) &node->u.ctf_expression.right, ctx->ctf_tc->uuid); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Invalid trace's `uuid` attribute."); goto error; } ctx->ctf_tc->is_uuid_set = true; _SET(set, _TRACE_UUID_SET); - } else if (!strcmp(left, "byte_order")) { + } else if (strcmp(left, "byte_order") == 0) { /* Default byte order is already known at this stage */ if (_IS_SET(set, _TRACE_BYTE_ORDER_SET)) { - _BT_LOGE_DUP_ATTR(node, "byte_order", + _BT_COMP_LOGE_DUP_ATTR(node, "byte_order", "trace"); ret = -EPERM; goto error; } - BT_ASSERT(ctx->ctf_tc->default_byte_order != -1); + BT_ASSERT(ctx->ctf_tc->default_byte_order != CTF_BYTE_ORDER_UNKNOWN); _SET(set, _TRACE_BYTE_ORDER_SET); - } else if (!strcmp(left, "packet.header")) { + } else if (strcmp(left, "packet.header") == 0) { if (_IS_SET(set, _TRACE_PACKET_HEADER_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate `packet.header` entry in trace."); ret = -EPERM; goto error; @@ -4104,7 +3924,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) struct ctf_node, siblings), &ctx->ctf_tc->packet_header_fc); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot create trace's packet header field class."); goto error; } @@ -4112,7 +3932,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) BT_ASSERT(ctx->ctf_tc->packet_header_fc); _SET(set, _TRACE_PACKET_HEADER_SET); } else { - _BT_LOGW_NODE(node, + _BT_COMP_LOGW_NODE(node, "Unknown attribute in stream class: " "attr-name=\"%s\"", left); } @@ -4122,7 +3942,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set) break; } default: - _BT_LOGE_NODE(node, "Unknown expression in trace."); + _BT_COMP_LOGE_NODE(node, "Unknown expression in trace."); ret = -EINVAL; goto error; } @@ -4149,7 +3969,7 @@ int visit_trace_decl(struct ctx *ctx, struct ctf_node *node) node->visited = TRUE; if (ctx->is_trace_visited) { - _BT_LOGE_NODE(node, "Duplicate trace (`trace` block)."); + _BT_COMP_LOGE_NODE(node, "Duplicate trace (`trace` block)."); ret = -EEXIST; goto error; } @@ -4159,7 +3979,7 @@ int visit_trace_decl(struct ctx *ctx, struct ctf_node *node) bt_list_for_each_entry(iter, decl_list, siblings) { ret = visit_trace_decl_entry(ctx, iter, &set); if (ret) { - _BT_LOGE_NODE(iter, "Cannot visit trace's entry (`trace` block): " + _BT_COMP_LOGE_NODE(iter, "Cannot visit trace's entry (`trace` block): " "ret=%d", ret); ctx_pop_scope(ctx); goto error; @@ -4169,21 +3989,21 @@ int visit_trace_decl(struct ctx *ctx, struct ctf_node *node) ctx_pop_scope(ctx); if (!_IS_SET(&set, _TRACE_MAJOR_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `major` attribute in trace (`trace` block)."); ret = -EPERM; goto error; } if (!_IS_SET(&set, _TRACE_MINOR_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `minor` attribute in trace (`trace` block)."); ret = -EPERM; goto error; } if (!_IS_SET(&set, _TRACE_BYTE_ORDER_SET)) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Missing `byte_order` attribute in trace (`trace` block)."); ret = -EPERM; goto error; @@ -4217,27 +4037,27 @@ int visit_env(struct ctx *ctx, struct ctf_node *node) &entry_node->u.ctf_expression.right; if (entry_node->type != NODE_CTF_EXPRESSION) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Wrong expression in environment entry: " "node-type=%d", entry_node->type); ret = -EPERM; goto error; } - left = concatenate_unary_strings( + left = ctf_ast_concatenate_unary_strings( &entry_node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot get environment entry's name."); ret = -EINVAL; goto error; } if (is_unary_string(right_head)) { - char *right = concatenate_unary_strings(right_head); + char *right = ctf_ast_concatenate_unary_strings(right_head); if (!right) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for environment entry's value: " "name=\"%s\"", left); ret = -EINVAL; @@ -4246,7 +4066,7 @@ int visit_env(struct ctx *ctx, struct ctf_node *node) if (strcmp(left, "tracer_name") == 0) { if (strncmp(right, "lttng", 5) == 0) { - BT_LOGI("Detected LTTng trace from `%s` environment value: " + BT_COMP_LOGI("Detected LTTng trace from `%s` environment value: " "tracer-name=\"%s\"", left, right); ctx->is_lttng = true; @@ -4268,7 +4088,7 @@ int visit_env(struct ctx *ctx, struct ctf_node *node) ret = get_unary_signed(right_head, &v); } if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for environment entry's value: " "name=\"%s\"", left); ret = -EINVAL; @@ -4279,7 +4099,7 @@ int visit_env(struct ctx *ctx, struct ctf_node *node) left, CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT, NULL, v); } else { - _BT_LOGW_NODE(entry_node, + _BT_COMP_LOGW_NODE(entry_node, "Environment entry has unknown type: " "name=\"%s\"", left); } @@ -4309,20 +4129,20 @@ int set_trace_byte_order(struct ctx *ctx, struct ctf_node *trace_node) if (node->type == NODE_CTF_EXPRESSION) { struct ctf_node *right_node; - left = concatenate_unary_strings( + left = ctf_ast_concatenate_unary_strings( &node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; } - if (!strcmp(left, "byte_order")) { + if (strcmp(left, "byte_order") == 0) { enum ctf_byte_order bo; if (_IS_SET(&set, _TRACE_BYTE_ORDER_SET)) { - _BT_LOGE_DUP_ATTR(node, "byte_order", + _BT_COMP_LOGE_DUP_ATTR(node, "byte_order", "trace"); ret = -EPERM; goto error; @@ -4334,14 +4154,14 @@ int set_trace_byte_order(struct ctx *ctx, struct ctf_node *trace_node) struct ctf_node, siblings); bo = byte_order_from_unary_expr(ctx, right_node); - if (bo == -1) { - _BT_LOGE_NODE(node, + if (bo == CTF_BYTE_ORDER_UNKNOWN) { + _BT_COMP_LOGE_NODE(node, "Invalid `byte_order` attribute in trace (`trace` block): " "expecting `le`, `be`, or `network`."); ret = -EINVAL; goto error; } else if (bo == CTF_BYTE_ORDER_DEFAULT) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Invalid `byte_order` attribute in trace (`trace` block): " "cannot be set to `native` here."); ret = -EPERM; @@ -4357,7 +4177,7 @@ int set_trace_byte_order(struct ctx *ctx, struct ctf_node *trace_node) } if (!_IS_SET(&set, _TRACE_BYTE_ORDER_SET)) { - _BT_LOGE_NODE(trace_node, + _BT_COMP_LOGE_NODE(trace_node, "Missing `byte_order` attribute in trace (`trace` block)."); ret = -EINVAL; goto error; @@ -4379,33 +4199,33 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, char *left = NULL; if (entry_node->type != NODE_CTF_EXPRESSION) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected node type: node-type=%d", entry_node->type); ret = -EPERM; goto error; } - left = concatenate_unary_strings(&entry_node->u.ctf_expression.left); + left = ctf_ast_concatenate_unary_strings(&entry_node->u.ctf_expression.left); if (!left) { - _BT_LOGE_NODE(entry_node, "Cannot concatenate unary strings."); + _BT_COMP_LOGE_NODE(entry_node, "Cannot concatenate unary strings."); ret = -EINVAL; goto error; } - if (!strcmp(left, "name")) { + if (strcmp(left, "name") == 0) { char *right; if (_IS_SET(set, _CLOCK_NAME_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "name", "clock class"); + _BT_COMP_LOGE_DUP_ATTR(entry_node, "name", "clock class"); ret = -EPERM; goto error; } - right = concatenate_unary_strings( + right = ctf_ast_concatenate_unary_strings( &entry_node->u.ctf_expression.right); if (!right) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `name` attribute."); ret = -EINVAL; goto error; @@ -4414,11 +4234,11 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, g_string_assign(clock->name, right); g_free(right); _SET(set, _CLOCK_NAME_SET); - } else if (!strcmp(left, "uuid")) { - uint8_t uuid[BABELTRACE_UUID_LEN]; + } else if (strcmp(left, "uuid") == 0) { + bt_uuid_t uuid; if (_IS_SET(set, _CLOCK_UUID_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "uuid", "clock class"); + _BT_COMP_LOGE_DUP_ATTR(entry_node, "uuid", "clock class"); ret = -EPERM; goto error; } @@ -4426,28 +4246,28 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = get_unary_uuid(ctx, &entry_node->u.ctf_expression.right, uuid); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Invalid clock class's `uuid` attribute."); goto error; } clock->has_uuid = true; - memcpy(&clock->uuid[0], uuid, 16); + bt_uuid_copy(clock->uuid, uuid); _SET(set, _CLOCK_UUID_SET); - } else if (!strcmp(left, "description")) { + } else if (strcmp(left, "description") == 0) { char *right; if (_IS_SET(set, _CLOCK_DESCRIPTION_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "description", + _BT_COMP_LOGE_DUP_ATTR(entry_node, "description", "clock class"); ret = -EPERM; goto error; } - right = concatenate_unary_strings( + right = ctf_ast_concatenate_unary_strings( &entry_node->u.ctf_expression.right); if (!right) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `description` attribute."); ret = -EINVAL; goto error; @@ -4456,11 +4276,11 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, g_string_assign(clock->description, right); g_free(right); _SET(set, _CLOCK_DESCRIPTION_SET); - } else if (!strcmp(left, "freq")) { + } else if (strcmp(left, "freq") == 0) { uint64_t freq = UINT64_C(-1); if (_IS_SET(set, _CLOCK_FREQ_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "freq", "clock class"); + _BT_COMP_LOGE_DUP_ATTR(entry_node, "freq", "clock class"); ret = -EPERM; goto error; } @@ -4468,14 +4288,14 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = get_unary_unsigned(ctx, &entry_node->u.ctf_expression.right, &freq); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `freq` attribute."); ret = -EINVAL; goto error; } if (freq == UINT64_C(-1) || freq == 0) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Invalid clock class frequency: freq=%" PRIu64, freq); ret = -EINVAL; @@ -4484,11 +4304,11 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, clock->frequency = freq; _SET(set, _CLOCK_FREQ_SET); - } else if (!strcmp(left, "precision")) { + } else if (strcmp(left, "precision") == 0) { uint64_t precision; if (_IS_SET(set, _CLOCK_PRECISION_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "precision", + _BT_COMP_LOGE_DUP_ATTR(entry_node, "precision", "clock class"); ret = -EPERM; goto error; @@ -4497,7 +4317,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = get_unary_unsigned(ctx, &entry_node->u.ctf_expression.right, &precision); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `precision` attribute."); ret = -EINVAL; goto error; @@ -4505,9 +4325,9 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, clock->precision = precision; _SET(set, _CLOCK_PRECISION_SET); - } else if (!strcmp(left, "offset_s")) { + } else if (strcmp(left, "offset_s") == 0) { if (_IS_SET(set, _CLOCK_OFFSET_S_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "offset_s", + _BT_COMP_LOGE_DUP_ATTR(entry_node, "offset_s", "clock class"); ret = -EPERM; goto error; @@ -4516,16 +4336,16 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = get_unary_signed( &entry_node->u.ctf_expression.right, offset_seconds); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `offset_s` attribute."); ret = -EINVAL; goto error; } _SET(set, _CLOCK_OFFSET_S_SET); - } else if (!strcmp(left, "offset")) { + } else if (strcmp(left, "offset") == 0) { if (_IS_SET(set, _CLOCK_OFFSET_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "offset", "clock class"); + _BT_COMP_LOGE_DUP_ATTR(entry_node, "offset", "clock class"); ret = -EPERM; goto error; } @@ -4533,18 +4353,18 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, ret = get_unary_unsigned(ctx, &entry_node->u.ctf_expression.right, offset_cycles); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `offset` attribute."); ret = -EINVAL; goto error; } _SET(set, _CLOCK_OFFSET_SET); - } else if (!strcmp(left, "absolute")) { + } else if (strcmp(left, "absolute") == 0) { struct ctf_node *right; if (_IS_SET(set, _CLOCK_ABSOLUTE_SET)) { - _BT_LOGE_DUP_ATTR(entry_node, "absolute", + _BT_COMP_LOGE_DUP_ATTR(entry_node, "absolute", "clock class"); ret = -EPERM; goto error; @@ -4555,7 +4375,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, struct ctf_node, siblings); ret = get_boolean(ctx, right); if (ret < 0) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Unexpected unary expression for clock class's `absolute` attribute."); ret = -EINVAL; goto error; @@ -4564,7 +4384,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node, clock->is_absolute = ret; _SET(set, _CLOCK_ABSOLUTE_SET); } else { - _BT_LOGW_NODE(entry_node, + _BT_COMP_LOGW_NODE(entry_node, "Unknown attribute in clock class: attr-name=\"%s\"", left); } @@ -4605,6 +4425,17 @@ void calibrate_clock_class_offsets(int64_t *offset_seconds, } } +static +void apply_clock_class_is_absolute(struct ctx *ctx, + struct ctf_clock_class *clock) +{ + if (ctx->decoder_config.force_clock_class_origin_unix_epoch) { + clock->is_absolute = true; + } + + return; +} + static void apply_clock_class_offset(struct ctx *ctx, struct ctf_clock_class *clock) @@ -4686,7 +4517,7 @@ int visit_clock_decl(struct ctx *ctx, struct ctf_node *clock_node) /* CTF 1.8's default frequency for a clock class is 1 GHz */ clock = ctf_clock_class_create(); if (!clock) { - _BT_LOGE_NODE(clock_node, + _BT_COMP_LOGE_NODE(clock_node, "Cannot create default clock class."); ret = -ENOMEM; goto end; @@ -4696,7 +4527,7 @@ int visit_clock_decl(struct ctx *ctx, struct ctf_node *clock_node) ret = visit_clock_decl_entry(ctx, entry_node, clock, &set, &offset_seconds, &offset_cycles); if (ret) { - _BT_LOGE_NODE(entry_node, + _BT_COMP_LOGE_NODE(entry_node, "Cannot visit clock class's entry: ret=%d", ret); goto end; @@ -4704,7 +4535,7 @@ int visit_clock_decl(struct ctx *ctx, struct ctf_node *clock_node) } if (!_IS_SET(&set, _CLOCK_NAME_SET)) { - _BT_LOGE_NODE(clock_node, + _BT_COMP_LOGE_NODE(clock_node, "Missing `name` attribute in clock class."); ret = -EPERM; goto end; @@ -4732,6 +4563,7 @@ int visit_clock_decl(struct ctx *ctx, struct ctf_node *clock_node) clock->offset_seconds = offset_seconds; clock->offset_cycles = offset_cycles; apply_clock_class_offset(ctx, clock); + apply_clock_class_is_absolute(ctx, clock); g_ptr_array_add(ctx->ctf_tc->clock_classes, clock); clock = NULL; @@ -4760,7 +4592,7 @@ int visit_root_decl(struct ctx *ctx, struct ctf_node *root_decl_node) root_decl_node->u.field_class_def.field_class_specifier_list, &root_decl_node->u.field_class_def.field_class_declarators); if (ret) { - _BT_LOGE_NODE(root_decl_node, + _BT_COMP_LOGE_NODE(root_decl_node, "Cannot add field class found in root scope."); goto end; } @@ -4769,7 +4601,7 @@ int visit_root_decl(struct ctx *ctx, struct ctf_node *root_decl_node) ret = visit_field_class_alias(ctx, root_decl_node->u.field_class_alias.target, root_decl_node->u.field_class_alias.alias); if (ret) { - _BT_LOGE_NODE(root_decl_node, + _BT_COMP_LOGE_NODE(root_decl_node, "Cannot add field class alias found in root scope."); goto end; } @@ -4784,7 +4616,7 @@ int visit_root_decl(struct ctx *ctx, struct ctf_node *root_decl_node) */ ret = visit_field_class_specifier_list(ctx, root_decl_node, &decl); if (ret) { - _BT_LOGE_NODE(root_decl_node, + _BT_COMP_LOGE_NODE(root_decl_node, "Cannot visit root scope's field class: " "ret=%d", ret); BT_ASSERT(!decl); @@ -4796,7 +4628,7 @@ int visit_root_decl(struct ctx *ctx, struct ctf_node *root_decl_node) break; } default: - _BT_LOGE_NODE(root_decl_node, + _BT_COMP_LOGE_NODE(root_decl_node, "Unexpected node type: node-type=%d", root_decl_node->type); ret = -EPERM; @@ -4809,15 +4641,16 @@ end: BT_HIDDEN struct ctf_visitor_generate_ir *ctf_visitor_generate_ir_create( - bt_self_component_source *self_comp, const struct ctf_metadata_decoder_config *decoder_config) { struct ctx *ctx = NULL; /* Create visitor's context */ - ctx = ctx_create(self_comp, decoder_config); + ctx = ctx_create(decoder_config); if (!ctx) { - BT_LOGE_STR("Cannot create visitor's context."); + BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, decoder_config->log_level, + decoder_config->self_comp, + "Cannot create visitor's context."); goto error; } @@ -4843,7 +4676,7 @@ bt_trace_class *ctf_visitor_generate_ir_get_ir_trace_class( { struct ctx *ctx = (void *) visitor; - BT_ASSERT(ctx); + BT_ASSERT_DBG(ctx); if (ctx->trace_class) { bt_trace_class_get_ref(ctx->trace_class); @@ -4858,8 +4691,8 @@ struct ctf_trace_class *ctf_visitor_generate_ir_borrow_ctf_trace_class( { struct ctx *ctx = (void *) visitor; - BT_ASSERT(ctx); - BT_ASSERT(ctx->ctf_tc); + BT_ASSERT_DBG(ctx); + BT_ASSERT_DBG(ctx->ctf_tc); return ctx->ctf_tc; } @@ -4870,7 +4703,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, int ret = 0; struct ctx *ctx = (void *) visitor; - BT_LOGI_STR("Visiting metadata's AST to generate CTF IR objects."); + BT_COMP_LOGI_STR("Visiting metadata's AST to generate CTF IR objects."); switch (node->type) { case NODE_ROOT: @@ -4885,10 +4718,10 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, * have the native byte order yet, and we don't have any * trace block yet, then fail with EINCOMPLETE. */ - if (ctx->ctf_tc->default_byte_order == -1) { + if (ctx->ctf_tc->default_byte_order == CTF_BYTE_ORDER_UNKNOWN) { bt_list_for_each_entry(iter, &node->u.root.trace, siblings) { if (got_trace_decl) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Duplicate trace (`trace` block)."); ret = -1; goto end; @@ -4896,7 +4729,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, ret = set_trace_byte_order(ctx, iter); if (ret) { - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Cannot set trace's native byte order: " "ret=%d", ret); goto end; @@ -4906,7 +4739,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } if (!got_trace_decl) { - BT_LOGD_STR("Incomplete AST: need trace (`trace` block)."); + BT_COMP_LOGD_STR("Incomplete AST: need trace (`trace` block)."); ret = -EINCOMPLETE; goto end; } @@ -4915,13 +4748,13 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, BT_ASSERT(ctx->ctf_tc->default_byte_order == CTF_BYTE_ORDER_LITTLE || ctx->ctf_tc->default_byte_order == CTF_BYTE_ORDER_BIG); BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* Environment */ bt_list_for_each_entry(iter, &node->u.root.env, siblings) { ret = visit_env(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit trace's environment (`env` block) entry: " "ret=%d", ret); goto end; @@ -4929,7 +4762,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* * Visit clock blocks. @@ -4937,7 +4770,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, bt_list_for_each_entry(iter, &node->u.root.clock, siblings) { ret = visit_clock_decl(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit clock class: ret=%d", ret); goto end; @@ -4945,7 +4778,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* * Visit root declarations next, as they can be used by any @@ -4955,7 +4788,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, siblings) { ret = visit_root_decl(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit root entry: ret=%d", ret); goto end; @@ -4963,22 +4796,22 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* Callsite blocks are not supported */ bt_list_for_each_entry(iter, &node->u.root.callsite, siblings) { - _BT_LOGW_NODE(iter, + _BT_COMP_LOGW_NODE(iter, "\"callsite\" blocks are not supported as of this version."); } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* Trace */ bt_list_for_each_entry(iter, &node->u.root.trace, siblings) { ret = visit_trace_decl(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit trace (`trace` block): " "ret=%d", ret); goto end; @@ -4986,13 +4819,13 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* Streams */ bt_list_for_each_entry(iter, &node->u.root.stream, siblings) { ret = visit_stream_decl(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit stream class: ret=%d", ret); goto end; @@ -5000,13 +4833,13 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); /* Events */ bt_list_for_each_entry(iter, &node->u.root.event, siblings) { ret = visit_event_decl(ctx, iter); if (ret) { - _BT_LOGE_NODE(iter, + _BT_COMP_LOGE_NODE(iter, "Cannot visit event class: ret=%d", ret); goto end; @@ -5014,11 +4847,11 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } BT_ASSERT(ctx->current_scope && - ctx->current_scope->parent_scope == NULL); + !ctx->current_scope->parent_scope); break; } default: - _BT_LOGE_NODE(node, + _BT_COMP_LOGE_NODE(node, "Unexpected node type: node-type=%d", node->type); ret = -EINVAL; @@ -5027,7 +4860,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, /* Update default clock classes */ ret = ctf_trace_class_update_default_clock_classes(ctx->ctf_tc, - ctx->log_level); + &ctx->log_cfg); if (ret) { ret = -EINVAL; goto end; @@ -5055,8 +4888,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } /* Resolve sequence lengths and variant tags */ - ret = ctf_trace_class_resolve_field_classes(ctx->ctf_tc, - ctx->log_level); + ret = ctf_trace_class_resolve_field_classes(ctx->ctf_tc, &ctx->log_cfg); if (ret) { ret = -EINVAL; goto end; @@ -5085,8 +4917,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, } /* Validate what we have so far */ - ret = ctf_trace_class_validate(ctx->ctf_tc, - ctx->log_level); + ret = ctf_trace_class_validate(ctx->ctf_tc, &ctx->log_cfg); if (ret) { ret = -EINVAL; goto end; @@ -5098,11 +4929,11 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor, * classes, warn about it because they are never translated. */ ctf_trace_class_warn_meaningless_header_fields(ctx->ctf_tc, - ctx->log_level); + &ctx->log_cfg); if (ctx->trace_class) { /* Copy new CTF metadata -> new IR metadata */ - ret = ctf_trace_class_translate(ctx->self_comp, + ret = ctf_trace_class_translate(ctx->log_cfg.self_comp, ctx->trace_class, ctx->ctf_tc); if (ret) { ret = -EINVAL;