BT_LOGD("Destroying structure/variant field type's field object: "
"addr=%p, field-ft-addr=%p, field-name=\"%s\"",
field, field->type, g_quark_to_string(field->name));
+ BT_LOGD_STR("Putting field type.");
bt_put(field->type);
g_free(field);
}
type->serialize = type_serialize_funcs[type->id];
if (init_bo) {
- int ret = bt_ctf_field_type_set_byte_order(type,
- BT_CTF_BYTE_ORDER_NATIVE);
+ int ret;
+ const enum bt_ctf_byte_order bo = BT_CTF_BYTE_ORDER_NATIVE;
+
+ BT_LOGD("Setting initial field type's byte order: bo=%s",
+ bt_ctf_byte_order_string(bo));
+ ret = bt_ctf_field_type_set_byte_order(type, bo);
assert(ret == 0);
}
tag_mappings_count =
bt_ctf_field_type_enumeration_get_mapping_count(
(struct bt_ctf_field_type *) variant->tag);
+ assert(tag_mappings_count >= 0);
/*
* Validate that each mapping found in the tag has a name which
if (!ret && type->frozen) {
/* Field type is valid */
+ BT_LOGV("Marking field type as valid: addr=%p", type);
type->valid = 1;
}
}
int bt_ctf_field_type_integer_set_size(struct bt_ctf_field_type *type,
- size_t size)
+ unsigned int size)
{
int ret = 0;
struct bt_ctf_field_type_integer *integer;
}
switch (base) {
+ case BT_CTF_INTEGER_BASE_UNSPECIFIED:
case BT_CTF_INTEGER_BASE_BINARY:
case BT_CTF_INTEGER_BASE_OCTAL:
case BT_CTF_INTEGER_BASE_DECIMAL:
return clock_class;
}
-int bt_ctf_field_type_integer_set_mapped_clock_class(
+BT_HIDDEN
+int bt_ctf_field_type_integer_set_mapped_clock_class_no_check(
struct bt_ctf_field_type *type,
struct bt_ctf_clock_class *clock_class)
{
goto end;
}
- if (type->frozen) {
- BT_LOGW("Invalid parameter: field type is frozen: addr=%p",
- type);
- ret = -1;
+ if (type->id != BT_CTF_FIELD_TYPE_ID_INTEGER) {
+ BT_LOGW("Invalid parameter: field type is not an integer field type: "
+ "addr=%p, ft-id=%s", type,
+ bt_ctf_field_type_id_string(type->id));
goto end;
}
return ret;
}
+int bt_ctf_field_type_integer_set_mapped_clock_class(
+ struct bt_ctf_field_type *type,
+ struct bt_ctf_clock_class *clock_class)
+{
+ int ret = 0;
+
+ if (!type) {
+ BT_LOGW_STR("Invalid parameter: field type is NULL.");
+ ret = -1;
+ goto end;
+ }
+
+ if (type->frozen) {
+ BT_LOGW("Invalid parameter: field type is frozen: addr=%p",
+ type);
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_ctf_field_type_integer_set_mapped_clock_class_no_check(
+ type, clock_class);
+
+end:
+ return ret;
+}
+
static
void bt_ctf_field_type_enum_iter_destroy(struct bt_object *obj)
{
struct bt_ctf_field_type_enumeration_mapping_iterator,
base);
+ BT_LOGD("Destroying enumeration field type mapping iterator: addr=%p",
+ obj);
+ BT_LOGD_STR("Putting parent enumeration field type.");
bt_put(&iter->enumeration_type->parent);
g_free(iter);
}
iter->u.name_quark = g_quark_try_string(name);
if (!iter->u.name_quark) {
- BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+ BT_LOGV("No such enumeration field type mapping name: "
+ "ft-addr=%p, mapping-name=\"%s\"",
+ type, name);
goto error;
}
/* Advance iterator to first entry, or leave index at -1. */
if (bt_ctf_field_type_enumeration_mapping_iterator_next(iter)) {
/* No entry found. */
+ BT_LOGV("No such enumeration field type mapping name: "
+ "ft-addr=%p, mapping-name=\"%s\"",
+ type, name);
goto error;
}
break;
}
default:
+ BT_LOGF("Invalid enumeration field type mapping iterator type: "
+ "type=%d", iter->type);
abort();
}
}
if (mapping_name) {
*mapping_name = g_quark_to_string(mapping->string);
+ assert(*mapping_name);
}
if (range_begin) {
if (mapping_name) {
*mapping_name = g_quark_to_string(mapping->string);
+ assert(*mapping_name);
}
if (range_begin) {
}
if (field_name) {
*field_name = g_quark_to_string(field->name);
+ assert(*field_name);
}
end:
return ret;
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+ BT_LOGV("No such structure field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
goto end;
}
structure = container_of(type, struct bt_ctf_field_type_structure,
parent);
if (!g_hash_table_lookup_extended(structure->field_name_to_index,
- GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ BT_LOGV("No such structure field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
goto end;
}
name_quark = g_quark_try_string(field_name);
if (!name_quark) {
- BT_LOGE("Cannot get GQuark: string=\"%s\"", field_name);
+ BT_LOGV("No such variant field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, field_name);
goto end;
}
variant = container_of(type, struct bt_ctf_field_type_variant, parent);
if (!g_hash_table_lookup_extended(variant->field_name_to_index,
- GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ BT_LOGV("No such variant field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, field_name);
goto end;
}
}
if (field_name) {
*field_name = g_quark_to_string(field->name);
+ assert(*field_name);
}
end:
return ret;
byte_order != BT_CTF_BYTE_ORDER_LITTLE_ENDIAN &&
byte_order != BT_CTF_BYTE_ORDER_BIG_ENDIAN &&
byte_order != BT_CTF_BYTE_ORDER_NETWORK) {
- BT_LOGW("Invalid parameter: unknown byte order: "
+ BT_LOGW("Invalid parameter: invalid byte order: "
"addr=%p, bo=%s", type,
bt_ctf_byte_order_string(byte_order));
ret = -1;
field_name_quark = query.mapping_name;
if (!g_hash_table_lookup_extended(variant->field_name_to_index,
- GUINT_TO_POINTER(field_name_quark), NULL, &index)) {
+ GUINT_TO_POINTER(field_name_quark), NULL, &index)) {
goto end;
}
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+ BT_LOGV("No such structure field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
ret = -1;
goto end;
}
structure = container_of(type, struct bt_ctf_field_type_structure,
parent);
if (!g_hash_table_lookup_extended(structure->field_name_to_index,
- GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ GUINT_TO_POINTER(name_quark),
+ NULL, (gpointer *)&index)) {
+ BT_LOGV("No such structure field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
ret = -1;
goto end;
}
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+ BT_LOGV("No such variant field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
ret = -1;
goto end;
}
variant = container_of(type, struct bt_ctf_field_type_variant,
parent);
if (!g_hash_table_lookup_extended(variant->field_name_to_index,
- GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+ GUINT_TO_POINTER(name_quark),
+ NULL, (gpointer *)&index)) {
+ BT_LOGV("No such variant field type field name: "
+ "ft-addr=%p, field-name=\"%s\"",
+ type, name);
ret = -1;
goto end;
}
}
BT_LOGD("Destroying integer field type object: addr=%p", type);
+ BT_LOGD_STR("Putting mapped clock class.");
bt_put(integer->mapped_clock);
g_free(integer);
}
BT_LOGD("Destroying enumeration field type object: addr=%p", type);
g_ptr_array_free(enumeration->entries, TRUE);
+ BT_LOGD_STR("Putting container field type.");
bt_put(enumeration->container);
g_free(enumeration);
}
g_ptr_array_free(variant->fields, TRUE);
g_hash_table_destroy(variant->field_name_to_index);
g_string_free(variant->tag_name, TRUE);
+ BT_LOGD_STR("Putting tag field type.");
bt_put(&variant->tag->parent);
BT_PUT(variant->tag_field_path);
g_free(variant);
}
BT_LOGD("Destroying array field type object: addr=%p", type);
+ BT_LOGD_STR("Putting element field type.");
bt_put(array->element_type);
g_free(array);
}
}
BT_LOGD("Destroying sequence field type object: addr=%p", type);
+ BT_LOGD_STR("Putting element field type.");
bt_put(sequence->element_type);
g_string_free(sequence->length_field_name, TRUE);
+ BT_LOGD_STR("Putting length field path.");
BT_PUT(sequence->length_field_path);
g_free(sequence);
}
BT_LOGD("Freezing integer field type object: addr=%p", type);
if (integer_type->mapped_clock) {
+ BT_LOGD_STR("Freezing integer field type's mapped clock class.");
bt_ctf_clock_class_freeze(integer_type->mapped_clock);
}
switch (base) {
case BT_CTF_INTEGER_BASE_DECIMAL:
+ case BT_CTF_INTEGER_BASE_UNSPECIFIED:
base_string = "decimal";
break;
case BT_CTF_INTEGER_BASE_HEXADECIMAL:
container_signed = bt_ctf_field_type_integer_get_signed(container_type);
assert(container_signed >= 0);
g_string_append(context->string, "enum : ");
+ BT_LOGD_STR("Serializing enumeration field type's container field type's metadata.");
ret = bt_ctf_field_type_serialize(enumeration->container, context);
if (ret) {
BT_LOGW("Cannot serialize enumeration field type's container field type's metadata: "
{
size_t i;
unsigned int indent;
- int64_t ret = 0;
+ int ret = 0;
struct bt_ctf_field_type_structure *structure = container_of(type,
struct bt_ctf_field_type_structure, parent);
GString *structure_field_name = context->field_name;
for (i = 0; i < structure->fields->len; i++) {
struct structure_field *field = structure->fields->pdata[i];
- BT_LOGV("Serializing structure field type's field metadata: "
- "index=%" PRId64 ", "
+ BT_LOGD("Serializing structure field type's field metadata: "
+ "index=%zu, "
"field-ft-addr=%p, field-name=\"%s\"",
i, field, g_quark_to_string(field->name));
ret = bt_ctf_field_type_serialize(field->type, context);
if (ret) {
BT_LOGW("Cannot serialize structure field type's field's metadata: "
- "index=%" PRId64 ", "
+ "index=%zu, "
"field-ft-addr=%p, field-name=\"%s\"",
i, field->type,
g_quark_to_string(field->name));
for (i = 0; i < variant->fields->len; i++) {
struct structure_field *field = variant->fields->pdata[i];
- BT_LOGV("Serializing variant field type's field metadata: "
- "index=%" PRId64 ", "
+ BT_LOGD("Serializing variant field type's field metadata: "
+ "index=%zu, "
"field-ft-addr=%p, field-name=\"%s\"",
i, field, g_quark_to_string(field->name));
ret = bt_ctf_field_type_serialize(field->type, context);
if (ret) {
BT_LOGW("Cannot serialize variant field type's field's metadata: "
- "index=%" PRId64 ", "
+ "index=%zu, "
"field-ft-addr=%p, field-name=\"%s\"",
i, field->type,
g_quark_to_string(field->name));
BT_LOGD("Serializing array field type's metadata: "
"ft-addr=%p, metadata-context-addr=%p", type, context);
+ BT_LOGD_STR("Serializing array field type's element field type's metadata.");
ret = bt_ctf_field_type_serialize(array->element_type, context);
if (ret) {
BT_LOGW("Cannot serialize array field type's element field type's metadata: "
BT_LOGD("Serializing sequence field type's metadata: "
"ft-addr=%p, metadata-context-addr=%p", type, context);
+ BT_LOGD_STR("Serializing sequence field type's element field type's metadata.");
ret = bt_ctf_field_type_serialize(sequence->element_type, context);
if (ret) {
BT_LOGW("Cannot serialize sequence field type's element field type's metadata: "
parent);
/* Copy the source enumeration's container */
+ BT_LOGD_STR("Copying enumeration field type's container field type.");
copy_container = bt_ctf_field_type_copy(enumeration->container);
if (!copy_container) {
BT_LOGE_STR("Cannot copy enumeration field type's container field type.");
struct bt_ctf_field_type *copy_field;
entry = g_ptr_array_index(structure->fields, i);
- BT_LOGV("Copying structure field type's field: "
+ BT_LOGD("Copying structure field type's field: "
"index=%" PRId64 ", "
"field-ft-addr=%p, field-name=\"%s\"",
i, entry, g_quark_to_string(entry->name));
variant = container_of(type, struct bt_ctf_field_type_variant,
parent);
if (variant->tag) {
+ BT_LOGD_STR("Copying variant field type's tag field type.");
copy_tag = bt_ctf_field_type_copy(&variant->tag->parent);
if (!copy_tag) {
BT_LOGE_STR("Cannot copy variant field type's tag field type.");
struct bt_ctf_field_type *copy_field;
entry = g_ptr_array_index(variant->fields, i);
- BT_LOGV("Copying variant field type's field: "
+ BT_LOGD("Copying variant field type's field: "
"index=%" PRId64 ", "
"field-ft-addr=%p, field-name=\"%s\"",
i, entry, g_quark_to_string(entry->name));
}
if (variant->tag_field_path) {
- BT_LOGV_STR("Copying variant field type's tag field path.");
+ BT_LOGD_STR("Copying variant field type's tag field path.");
copy_variant->tag_field_path = bt_ctf_field_path_copy(
variant->tag_field_path);
if (!copy_variant->tag_field_path) {
BT_LOGD("Copying array field type's: addr=%p", type);
array = container_of(type, struct bt_ctf_field_type_array,
parent);
+ BT_LOGD_STR("Copying array field type's element field type.");
copy_element = bt_ctf_field_type_copy(array->element_type);
if (!copy_element) {
BT_LOGE_STR("Cannot copy array field type's element field type.");
BT_LOGD("Copying sequence field type's: addr=%p", type);
sequence = container_of(type, struct bt_ctf_field_type_sequence,
parent);
+ BT_LOGD_STR("Copying sequence field type's element field type.");
copy_element = bt_ctf_field_type_copy(sequence->element_type);
if (!copy_element) {
BT_LOGE_STR("Cannot copy sequence field type's element field type.");
copy_sequence = container_of(copy, struct bt_ctf_field_type_sequence,
parent);
if (sequence->length_field_path) {
- BT_LOGV_STR("Copying sequence field type's length field path.");
+ BT_LOGD_STR("Copying sequence field type's length field path.");
copy_sequence->length_field_path = bt_ctf_field_path_copy(
sequence->length_field_path);
if (!copy_sequence->length_field_path) {
struct bt_ctf_field_type *type)
{
struct bt_ctf_field_type *copy;
- struct bt_ctf_field_type_string *string;
BT_LOGD("Copying string field type's: addr=%p", type);
copy = bt_ctf_field_type_string_create();
goto end;
}
- string = container_of(type, struct bt_ctf_field_type_string,
- parent);
BT_LOGD("Copied string field type: original-ft-addr=%p, copy-ft-addr=%p",
type, copy);
end:
if (int_type_a->mapped_clock != int_type_b->mapped_clock) {
BT_LOGV("Integer field types differ: different mapped clock classes: "
"ft-a-mapped-clock-class-addr=%p, "
- "ft-b-mapped-clock-class-addr=%p, ",
- "ft-a-mapped-clock-class-name=\"%s\", ",
+ "ft-b-mapped-clock-class-addr=%p, "
+ "ft-a-mapped-clock-class-name=\"%s\", "
"ft-b-mapped-clock-class-name=\"%s\"",
int_type_a->mapped_clock, int_type_b->mapped_clock,
int_type_a->mapped_clock ? bt_ctf_clock_class_get_name(int_type_a->mapped_clock) : "",
/* Exponent length */
if (float_a->exp_dig != float_b->exp_dig) {
BT_LOGV("Floating point number field types differ: different exponent sizes: "
- "ft-a-exp-size=%s, ft-b-exp-size=%s",
+ "ft-a-exp-size=%u, ft-b-exp-size=%u",
float_a->exp_dig, float_b->exp_dig);
goto end;
}
/* Mantissa length */
if (float_a->mant_dig != float_b->mant_dig) {
BT_LOGV("Floating point number field types differ: different mantissa sizes: "
- "ft-a-mant-size=%s, ft-b-mant-size=%s",
+ "ft-a-mant-size=%u, ft-b-mant-size=%u",
float_a->mant_dig, float_b->mant_dig);
goto end;
}
ret = bt_ctf_field_type_compare(field_a->type, field_b->type);
if (ret == 1) {
BT_LOGV("Structure/variant field type fields differ: different field types: "
- "field-name=\"%s\", field-a-ft-addr=%s, field-b-ft-addr=%s",
+ "field-name=\"%s\", field-a-ft-addr=%p, field-b-ft-addr=%p",
g_quark_to_string(field_a->name),
field_a->type, field_b->type);
}
/* Tag name */
if (strcmp(variant_a->tag_name->str, variant_b->tag_name->str)) {
BT_LOGV("Variant field types differ: different tag field names: "
- "ft-a-tag-field-name=%u, ft-b-tag-field-name=%u",
+ "ft-a-tag-field-name=\"%s\", ft-b-tag-field-name=\"%s\"",
variant_a->tag_name->str, variant_b->tag_name->str);
goto end;
}
if (strcmp(sequence_a->length_field_name->str,
sequence_b->length_field_name->str)) {
BT_LOGV("Sequence field types differ: different length field names: "
- "ft-a-length-field-name=%u, ft-b-length-field-name=%u",
+ "ft-a-length-field-name=\"%s\", "
+ "ft-b-length-field-name=\"%s\"",
sequence_a->length_field_name->str,
sequence_b->length_field_name->str);
goto end;
projects / babeltrace.git / blobdiff