{
int ret = 0;
GQuark name_quark = g_quark_from_string(field_name);
- GQuark underscore_name_quark;
struct structure_field *field;
- GString *underscore_name = g_string_new(NULL);
-
- if (!underscore_name) {
- BT_LOGE_STR("Failed to allocate a GString.");
- ret = -1;
- goto end;
- }
-
- g_string_assign(underscore_name, "_");
- g_string_append(underscore_name, field_name);
- underscore_name_quark = g_quark_from_string(underscore_name->str);
/* Make sure structure does not contain a field of the same name */
if (g_hash_table_lookup_extended(field_name_to_index,
goto end;
}
- if (g_hash_table_lookup_extended(field_name_to_index,
- GUINT_TO_POINTER(underscore_name_quark), NULL, NULL)) {
- BT_LOGW("Structure or variant field type already contains a field type with this name: "
- "field-name=\"%s\"", underscore_name->str);
- ret = -1;
- goto end;
- }
-
field = g_new0(struct structure_field, 1);
if (!field) {
BT_LOGE_STR("Failed to allocate one structure/variant field type field.");
g_hash_table_insert(field_name_to_index,
GUINT_TO_POINTER(name_quark),
GUINT_TO_POINTER(fields->len));
- g_hash_table_insert(field_name_to_index,
- GUINT_TO_POINTER(underscore_name_quark),
- GUINT_TO_POINTER(fields->len));
g_ptr_array_add(fields, field);
BT_LOGV("Added structure/variant field type field: field-ft-addr=%p, "
"field-name=\"%s\"", field_type, field_name);
end:
- g_string_free(underscore_name, TRUE);
return ret;
}
"tag-ft-addr=%p, tag-field-name=\"%s\"",
enum_tag, tag_name);
- if (tag_name && bt_identifier_is_valid(tag_name)) {
+ if (tag_name && !bt_identifier_is_valid(tag_name)) {
BT_LOGW("Invalid parameter: tag field name is not a valid CTF identifier: "
"tag-ft-addr=%p, tag-field-name=\"%s\"",
enum_tag, tag_name);
goto end;
}
- if (bt_identifier_is_valid(name)) {
+ if (!bt_identifier_is_valid(name)) {
BT_LOGW("Invalid parameter: tag field name is not a valid CTF identifier: "
"variant-ft-addr=%p, tag-field-name=\"%s\"",
type, name);
goto error;
}
- if (bt_identifier_is_valid(length_field_name)) {
+ if (!bt_identifier_is_valid(length_field_name)) {
BT_LOGW("Invalid parameter: length field name is not a valid CTF identifier: "
"length-field-name=\"%s\"", length_field_name);
goto error;
{
g_string_append_c(context->string, ' ');
- if (bt_identifier_is_valid(name) || *name == '_') {
+ if (!bt_identifier_is_valid(name) || *name == '_') {
g_string_append_c(context->string, '_');
}
for (entry = 0; entry < enumeration->entries->len; entry++) {
struct enumeration_mapping *mapping =
enumeration->entries->pdata[entry];
+ const char *label = g_quark_to_string(mapping->string);
+
+ g_string_append(context->string, "\"");
+
+ if (!bt_identifier_is_valid(label) || label[0] == '_') {
+ g_string_append(context->string, "_");
+ }
+
+ g_string_append_printf(context->string, "%s\" = ", label);
if (container_signed) {
if (mapping->range_start._signed ==
mapping->range_end._signed) {
g_string_append_printf(context->string,
- "\"%s\" = %" PRId64,
- g_quark_to_string(mapping->string),
+ "%" PRId64,
mapping->range_start._signed);
} else {
g_string_append_printf(context->string,
- "\"%s\" = %" PRId64 " ... %" PRId64,
- g_quark_to_string(mapping->string),
+ "%" PRId64 " ... %" PRId64,
mapping->range_start._signed,
mapping->range_end._signed);
}
if (mapping->range_start._unsigned ==
mapping->range_end._unsigned) {
g_string_append_printf(context->string,
- "\"%s\" = %" PRIu64,
- g_quark_to_string(mapping->string),
+ "%" PRIu64,
mapping->range_start._unsigned);
} else {
g_string_append_printf(context->string,
- "\"%s\" = %" PRIu64 " ... %" PRIu64,
- g_quark_to_string(mapping->string),
+ "%" PRIu64 " ... %" PRIu64,
mapping->range_start._unsigned,
mapping->range_end._unsigned);
}
struct ctf_node *iter;
int64_t start = 0, end = 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) {
*last = end + 1;
+ if (label[0] == '_') {
+ /*
+ * Strip the first underscore of any enumeration field
+ * type's label in case this enumeration FT is used as
+ * a variant FT tag later. The variant FT 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];
+ }
+
if (is_signed) {
- ret = bt_ctf_field_type_enumeration_add_mapping(enum_decl, label,
- start, end);
+ ret = bt_field_type_enumeration_add_mapping_signed(enum_decl,
+ effective_label, start, end);
} else {
ret = bt_field_type_enumeration_add_mapping_unsigned(enum_decl,
- label, (uint64_t) start, (uint64_t) end);
+ effective_label, (uint64_t) start, (uint64_t) end);
}
if (ret) {
_BT_LOGE_NODE(enumerator,