/*
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*/
-#define BT_LOG_TAG "CTF-WRITER-FIELD-TYPES"
+#define BT_LOG_TAG "CTF-WRITER/FIELD-TYPES"
#include "logging.h"
#include <float.h>
#include <inttypes.h>
+#include <stdbool.h>
#include <stdlib.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/utils.h>
#include "common/assert.h"
#include "compat/compiler.h"
bool init_bo, bt_ctf_object_release_func release_func,
struct bt_ctf_field_type_common_methods *methods)
{
- BT_ASSERT(ft && (ft->id > BT_CTF_FIELD_TYPE_ID_UNKNOWN) &&
+ BT_ASSERT_DBG(ft && (ft->id > BT_CTF_FIELD_TYPE_ID_UNKNOWN) &&
(ft->id < BT_CTF_FIELD_TYPE_ID_NR));
bt_ctf_object_init_shared(&ft->base, release_func);
BT_LOGD("Setting initial field type's byte order: bo=%s",
bt_ctf_byte_order_string(bo));
ret = bt_ctf_field_type_common_set_byte_order(ft, bo);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
}
ft->alignment = 1;
{
struct bt_ctf_field_type_common_integer *int_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(size > 0);
+ BT_ASSERT_DBG(size > 0);
BT_LOGD("Initializing common integer field type object: size=%u",
size);
ft->id = BT_CTF_FIELD_TYPE_ID_INTEGER;
{
struct bt_ctf_field_type_common_enumeration *enum_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(container_ft);
+ BT_ASSERT_DBG(container_ft);
BT_LOGD("Initializing common enumeration field type object: int-ft-addr=%p",
container_ft);
ft->id = BT_CTF_FIELD_TYPE_ID_ENUM;
{
struct bt_ctf_field_type_common_array *array_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(element_ft);
+ BT_ASSERT_DBG(element_ft);
BT_LOGD("Initializing common array field type object: element-ft-addr=%p, "
"length=%u", element_ft, length);
ft->id = BT_CTF_FIELD_TYPE_ID_ARRAY;
{
struct bt_ctf_field_type_common_sequence *seq_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(element_ft);
- BT_ASSERT(length_field_name);
- BT_ASSERT(bt_ctf_identifier_is_valid(length_field_name));
+ BT_ASSERT_DBG(element_ft);
+ BT_ASSERT_DBG(length_field_name);
+ BT_ASSERT_DBG(bt_ctf_identifier_is_valid(length_field_name));
BT_LOGD("Initializing common sequence field type object: element-ft-addr=%p, "
"length-field-name=\"%s\"", element_ft, length_field_name);
ft->id = BT_CTF_FIELD_TYPE_ID_SEQUENCE;
{
struct bt_ctf_field_type_common_variant *var_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(!tag_name || bt_ctf_identifier_is_valid(tag_name));
+ BT_ASSERT_DBG(!tag_name || bt_ctf_identifier_is_valid(tag_name));
BT_LOGD("Initializing common variant field type object: "
"tag-ft-addr=%p, tag-field-name=\"%s\"",
tag_ft, tag_name);
mapping->string == overlap_query->mapping_name;
if (overlap_query->overlaps) {
- BT_LOGV("Overlapping enumeration field type mappings: "
+ BT_LOGT("Overlapping enumeration field type mappings: "
"mapping-name=\"%s\", "
"mapping-a-range-start=%" PRId64 ", "
"mapping-a-range-end=%" PRId64 ", "
member_ft = &choice->type;
member_name = &choice->name;
- BT_ASSERT(!choice->ranges);
+ BT_ASSERT_DBG(!choice->ranges);
choice->ranges = g_array_new(FALSE, TRUE,
sizeof(struct bt_ctf_field_type_common_variant_choice_range));
- BT_ASSERT(choice->ranges);
+ BT_ASSERT_DBG(choice->ranges);
} else {
struct bt_ctf_field_type_common_structure_field *field =
&g_array_index(members,
g_hash_table_insert(field_name_to_index,
GUINT_TO_POINTER(name_quark),
GUINT_TO_POINTER(members->len - 1));
- BT_LOGV("Added structure/variant field type member: member-ft-addr=%p, "
+ BT_LOGT("Added structure/variant field type member: member-ft-addr=%p, "
"member-name=\"%s\"", field_type, field_name);
end:
default:
BT_LOGF("Invalid enumeration field type mapping iterator type: "
"type=%d", iter->type);
- abort();
+ bt_common_abort();
}
}
int64_t i, j, len;
int is_signed;
- BT_LOGV("Setting enumeration field type's overlap flag: addr=%p",
+ BT_LOGT("Setting enumeration field type's overlap flag: addr=%p",
ft);
len = ft->entries->len;
is_signed = bt_ctf_field_type_common_integer_is_signed(
<= mapping[1]->range_end._signed
&& mapping[0]->range_end._signed
>= mapping[1]->range_start._signed) {
- ft->has_overlapping_ranges = BT_TRUE;
+ ft->has_overlapping_ranges = BT_CTF_TRUE;
goto end;
}
} else {
<= mapping[1]->range_end._unsigned
&& mapping[0]->range_end._unsigned
>= mapping[1]->range_start._unsigned) {
- ft->has_overlapping_ranges = BT_TRUE;
+ ft->has_overlapping_ranges = BT_CTF_TRUE;
goto end;
}
}
end:
if (ft->has_overlapping_ranges) {
- BT_LOGV_STR("Enumeration field type has overlapping ranges.");
+ BT_LOGT_STR("Enumeration field type has overlapping ranges.");
} else {
- BT_LOGV_STR("Enumeration field type has no overlapping ranges.");
+ BT_LOGT_STR("Enumeration field type has no overlapping ranges.");
}
}
bt_ctf_field_type_common_structure_get_field_count(ft);
int64_t i;
- BT_ASSERT(field_count >= 0);
+ BT_ASSERT_DBG(field_count >= 0);
for (i = 0; i < field_count; ++i) {
const char *field_name;
ret = bt_ctf_field_type_common_structure_borrow_field_by_index(ft,
&field_name, &child_ft, i);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
ret = bt_ctf_field_type_common_validate(child_ft);
if (ret) {
BT_LOGW("Invalid structure field type: "
}
static
-bt_bool bt_ctf_field_type_common_enumeration_has_overlapping_ranges(
+bt_ctf_bool bt_ctf_field_type_common_enumeration_has_overlapping_ranges(
struct bt_ctf_field_type_common_enumeration *enum_ft)
{
if (!enum_ft->common.frozen) {
ret = bt_ctf_field_type_common_variant_borrow_field_by_index(ft,
&field_name, &child_ft, i);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
ret = bt_ctf_field_type_common_validate(child_ft);
if (ret) {
BT_LOGW("Invalid variant field type: "
{
int ret = 0;
- BT_ASSERT(ft);
+ BT_ASSERT_DBG(ft);
if (ft->valid) {
/* Already marked as valid */
if (ret == 0 && ft->frozen) {
/* Field type is valid */
- BT_LOGV("Marking field type as valid: addr=%p", ft);
+ BT_LOGT("Marking field type as valid: addr=%p", ft);
ft->valid = 1;
}
}
BT_HIDDEN
-bt_bool bt_ctf_field_type_common_integer_is_signed(struct bt_ctf_field_type_common *ft)
+bt_ctf_bool bt_ctf_field_type_common_integer_is_signed(struct bt_ctf_field_type_common *ft)
{
struct bt_ctf_field_type_common_integer *int_ft = BT_CTF_FROM_COMMON(ft);
BT_HIDDEN
int bt_ctf_field_type_common_integer_set_is_signed(struct bt_ctf_field_type_common *ft,
- bt_bool is_signed)
+ bt_ctf_bool is_signed)
{
int ret = 0;
struct bt_ctf_field_type_common_integer *int_ft = BT_CTF_FROM_COMMON(ft);
}
int_ft->is_signed = !!is_signed;
- BT_LOGV("Set integer field type's signedness: addr=%p, is-signed=%d",
+ BT_LOGT("Set integer field type's signedness: addr=%p, is-signed=%d",
ft, is_signed);
end:
}
int_ft->size = size;
- BT_LOGV("Set integer field type's size: addr=%p, size=%u",
+ BT_LOGT("Set integer field type's size: addr=%p, size=%u",
ft, size);
end:
ret = -1;
}
- BT_LOGV("Set integer field type's base: addr=%p, base=%s",
+ BT_LOGT("Set integer field type's base: addr=%p, base=%s",
ft, bt_ctf_integer_base_string(base));
end:
}
int_ft->encoding = encoding;
- BT_LOGV("Set integer field type's encoding: addr=%p, encoding=%s",
+ BT_LOGT("Set integer field type's encoding: addr=%p, encoding=%s",
ft, bt_ctf_string_encoding_string(encoding));
end:
bt_ctf_object_put_ref(int_ft->mapped_clock_class);
int_ft->mapped_clock_class = bt_ctf_object_get_ref(clock_class);
- BT_LOGV("Set integer field type's mapped clock class: ft-addr=%p, "
+ BT_LOGT("Set integer field type's mapped clock class: ft-addr=%p, "
"clock-class-addr=%p, clock-class-name=\"%s\"",
ft, clock_class, bt_ctf_clock_class_get_name(clock_class));
if (mapping_name) {
*mapping_name = g_quark_to_string(mapping->string);
- BT_ASSERT(*mapping_name);
+ BT_ASSERT_DBG(*mapping_name);
}
if (range_begin) {
if (mapping_name) {
*mapping_name = g_quark_to_string(mapping->string);
- BT_ASSERT(*mapping_name);
+ BT_ASSERT_DBG(*mapping_name);
}
if (range_begin) {
g_ptr_array_add(enum_ft->entries, mapping);
g_ptr_array_sort(enum_ft->entries,
(GCompareFunc) compare_enumeration_mappings_signed);
- BT_LOGV("Added mapping to signed enumeration field type: addr=%p, "
+ BT_LOGT("Added mapping to signed enumeration field type: addr=%p, "
"name=\"%s\", range-start=%" PRId64 ", "
"range-end=%" PRId64,
ft, string, range_start, range_end);
g_ptr_array_add(enum_ft->entries, mapping);
g_ptr_array_sort(enum_ft->entries,
(GCompareFunc) compare_enumeration_mappings_unsigned);
- BT_LOGV("Added mapping to unsigned enumeration field type: addr=%p, "
+ BT_LOGT("Added mapping to unsigned enumeration field type: addr=%p, "
"name=\"%s\", range-start=%" PRIu64 ", "
"range-end=%" PRIu64,
ft, string, range_start, range_end);
}
flt_ft->exp_dig = exponent_digits;
- BT_LOGV("Set floating point number field type's exponent size: addr=%p, "
+ BT_LOGT("Set floating point number field type's exponent size: addr=%p, "
"exp-size=%u", ft, exponent_digits);
end:
}
flt_ft->mant_dig = mantissa_digits;
- BT_LOGV("Set floating point number field type's mantissa size: addr=%p, "
+ BT_LOGT("Set floating point number field type's mantissa size: addr=%p, "
"mant-size=%u", ft, mantissa_digits);
end:
GQuark name_quark;
uint64_t i;
- BT_ASSERT(ft);
- BT_ASSERT(field_name);
- BT_ASSERT(field_type);
- BT_ASSERT(ft->id == BT_CTF_FIELD_TYPE_ID_STRUCT);
+ BT_ASSERT_DBG(ft);
+ BT_ASSERT_DBG(field_name);
+ BT_ASSERT_DBG(field_type);
+ BT_ASSERT_DBG(ft->id == BT_CTF_FIELD_TYPE_ID_STRUCT);
name_quark = g_quark_from_string(field_name);
for (i = 0; i < struct_ft->fields->len; i++) {
goto end;
}
- BT_LOGV("Added structure field type field: struct-ft-addr=%p, "
+ BT_LOGT("Added structure field type field: struct-ft-addr=%p, "
"field-ft-addr=%p, field-name=\"%s\"", ft,
field_type, field_name);
if (field_name) {
*field_name = g_quark_to_string(field->name);
- BT_ASSERT(*field_name);
+ BT_ASSERT_DBG(*field_name);
}
return 0;
"Field type");
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGV("No such structure field type field name: "
+ BT_LOGT("No such structure field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
goto end;
if (!g_hash_table_lookup_extended(struct_ft->field_name_to_index,
GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) {
- BT_LOGV("No such structure field type field name: "
+ BT_LOGT("No such structure field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
goto end;
"Field type");
if (!var_ft->tag_ft) {
- BT_LOGV("Variant field type has no tag field type: "
+ BT_LOGT("Variant field type has no tag field type: "
"addr=%p", ft);
goto end;
}
"Field type");
if (var_ft->tag_name->len == 0) {
- BT_LOGV("Variant field type has no tag field name: "
+ BT_LOGT("Variant field type has no tag field name: "
"addr=%p", ft);
goto end;
}
}
g_string_assign(var_ft->tag_name, name);
- BT_LOGV("Set variant field type's tag field name: addr=%p, "
+ BT_LOGT("Set variant field type's tag field name: addr=%p, "
"tag-field-name=\"%s\"", ft, name);
end:
goto end;
}
- BT_LOGV("Added variant field type field: variant-ft-addr=%p, "
+ BT_LOGT("Added variant field type field: variant-ft-addr=%p, "
"field-ft-addr=%p, field-name=\"%s\"", ft,
field_type, field_name);
"Field type");
name_quark = g_quark_try_string(field_name);
if (!name_quark) {
- BT_LOGV("No such variant field type field name: "
+ BT_LOGT("No such variant field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, field_name);
goto end;
if (!g_hash_table_lookup_extended(var_ft->choice_name_to_index,
GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) {
- BT_LOGV("No such variant field type field name: "
+ BT_LOGT("No such variant field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, field_name);
goto end;
if (field_name) {
*field_name = g_quark_to_string(choice->name);
- BT_ASSERT(*field_name);
+ BT_ASSERT_DBG(*field_name);
}
return 0;
uint64_t i;
struct bt_ctf_field_type_common_variant *var_ft = BT_CTF_FROM_COMMON(ft);
- BT_ASSERT(ft);
- BT_ASSERT(ft->id == BT_CTF_FIELD_TYPE_ID_VARIANT);
+ BT_ASSERT_DBG(ft);
+ BT_ASSERT_DBG(ft->id == BT_CTF_FIELD_TYPE_ID_VARIANT);
if (bt_ctf_field_type_common_variant_update_choices(ft)) {
ret = INT64_C(-1);
BT_CTF_ASSERT_PRE_NON_NULL(ft, "Field type");
BT_CTF_ASSERT_PRE_CTF_FT_COMMON_HAS_ID(ft, BT_CTF_FIELD_TYPE_ID_ARRAY,
"Field type");
- BT_ASSERT(array_ft && array_ft->element_ft);
+ BT_ASSERT_DBG(array_ft && array_ft->element_ft);
return array_ft->element_ft;
}
}
array_ft->element_ft = bt_ctf_object_get_ref(element_ft);
- BT_LOGV("Set array field type's element field type: array-ft-addr=%p, "
+ BT_LOGT("Set array field type's element field type: array-ft-addr=%p, "
"element-ft-addr=%p", ft, element_ft);
end:
seq_ft->element_ft = element_ft;
bt_ctf_object_get_ref(seq_ft->element_ft);
- BT_LOGV("Set sequence field type's element field type: sequence-ft-addr=%p, "
+ BT_LOGT("Set sequence field type's element field type: sequence-ft-addr=%p, "
"element-ft-addr=%p", ft, element_ft);
end:
}
string_ft->encoding = encoding;
- BT_LOGV("Set string field type's encoding: addr=%p, encoding=%s",
+ BT_LOGT("Set string field type's encoding: addr=%p, encoding=%s",
ft, bt_ctf_string_encoding_string(encoding));
end:
struct bt_ctf_field_type_common *element_ft =
bt_ctf_field_type_common_sequence_borrow_element_field_type(ft);
- BT_ASSERT(element_ft);
+ BT_ASSERT_DBG(element_ft);
ret = bt_ctf_field_type_common_get_alignment(element_ft);
break;
}
struct bt_ctf_field_type_common *element_ft =
bt_ctf_field_type_common_array_borrow_element_field_type(ft);
- BT_ASSERT(element_ft);
+ BT_ASSERT_DBG(element_ft);
ret = bt_ctf_field_type_common_get_alignment(element_ft);
break;
}
element_count = bt_ctf_field_type_common_structure_get_field_count(
ft);
- BT_ASSERT(element_count >= 0);
+ BT_ASSERT_DBG(element_count >= 0);
for (i = 0; i < element_count; i++) {
struct bt_ctf_field_type_common *field = NULL;
ret = bt_ctf_field_type_common_structure_borrow_field_by_index(
ft, NULL, &field, i);
- BT_ASSERT(ret == 0);
- BT_ASSERT(field);
+ BT_ASSERT_DBG(ret == 0);
+ BT_ASSERT_DBG(field);
field_alignment = bt_ctf_field_type_common_get_alignment(
field);
if (field_alignment < 0) {
ft->alignment = alignment;
ret = 0;
- BT_LOGV("Set field type's alignment: addr=%p, align=%u",
+ BT_LOGT("Set field type's alignment: addr=%p, align=%u",
ft, alignment);
end:
goto end;
}
- BT_ASSERT(ret == BT_CTF_BYTE_ORDER_NATIVE ||
+ BT_ASSERT_DBG(ret == BT_CTF_BYTE_ORDER_NATIVE ||
ret == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN ||
ret == BT_CTF_BYTE_ORDER_BIG_ENDIAN ||
ret == BT_CTF_BYTE_ORDER_NETWORK);
ft->methods->set_byte_order(ft, byte_order);
}
- BT_LOGV("Set field type's byte order: addr=%p, bo=%s",
+ BT_LOGT("Set field type's byte order: addr=%p, bo=%s",
ft, bt_ctf_byte_order_string(byte_order));
end:
return;
}
- BT_ASSERT(ft->methods->freeze);
+ BT_ASSERT_DBG(ft->methods->freeze);
ft->methods->freeze(ft);
}
struct bt_ctf_field_type_common *ft_copy = NULL;
BT_CTF_ASSERT_PRE_NON_NULL(ft, "Field type");
- BT_ASSERT(ft->methods->copy);
+ BT_ASSERT_DBG(ft->methods->copy);
ft_copy = ft->methods->copy(ft);
if (!ft_copy) {
BT_LOGE_STR("Cannot copy field type.");
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGV("No such structure field type field name: "
+ BT_LOGT("No such structure field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
ret = -1;
if (!g_hash_table_lookup_extended(struct_ft->field_name_to_index,
GUINT_TO_POINTER(name_quark),
NULL, (gpointer *) &index)) {
- BT_LOGV("No such structure field type field name: "
+ BT_LOGT("No such structure field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
ret = -1;
"Field type");
name_quark = g_quark_try_string(name);
if (!name_quark) {
- BT_LOGV("No such variant field type field name: "
+ BT_LOGT("No such variant field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
ret = -1;
if (!g_hash_table_lookup_extended(var_ft->choice_name_to_index,
GUINT_TO_POINTER(name_quark),
NULL, (gpointer *) &index)) {
- BT_LOGV("No such variant field type field name: "
+ BT_LOGT("No such variant field type field name: "
"ft-addr=%p, field-name=\"%s\"",
ft, name);
ret = -1;
bt_ctf_object_get_ref(path);
BT_CTF_OBJECT_MOVE_REF(seq_ft->length_field_path, path);
- BT_LOGV("Set sequence field type's length field path: ft-addr=%p, "
+ BT_LOGT("Set sequence field type's length field path: ft-addr=%p, "
"field-path-addr=%p", ft, path);
end:
bt_ctf_object_get_ref(path);
BT_CTF_OBJECT_MOVE_REF(var_ft->tag_field_path, path);
- BT_LOGV("Set variant field type's tag field path: ft-addr=%p, "
+ BT_LOGT("Set variant field type's tag field path: ft-addr=%p, "
"field-path-addr=%p", ft, path);
end:
bt_ctf_object_put_ref(var_ft->tag_ft);
var_ft->tag_ft = bt_ctf_object_get_ref(tag_ft);
- BT_LOGV("Set variant field type's tag field type: variant-ft-addr=%p, "
+ BT_LOGT("Set variant field type's tag field type: variant-ft-addr=%p, "
"tag-ft-addr=%p", ft, tag_ft);
end:
goto end;
}
- BT_ASSERT(var_ft->tag_ft);
+ BT_ASSERT_DBG(var_ft->tag_ft);
is_signed = !!var_ft->tag_ft->container_ft->is_signed;
for (i = 0; i < var_ft->choices->len; i++) {
goto end;
}
- BT_ASSERT(choice->ranges);
+ BT_ASSERT_DBG(choice->ranges);
g_array_set_size(choice->ranges, 0);
while (bt_ctf_field_type_enumeration_mapping_iterator_next(iter) == 0) {
&range.lower.u, &range.upper.u);
}
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
g_array_append_val(choice->ranges, range);
}
/* Length */
if (int_ft_a->size != int_ft_b->size) {
- BT_LOGV("Integer field types differ: different sizes: "
+ BT_LOGT("Integer field types differ: different sizes: "
"ft-a-size=%u, ft-b-size=%u",
int_ft_a->size, int_ft_b->size);
goto end;
/* Byte order */
if (int_ft_a->user_byte_order != int_ft_b->user_byte_order) {
- BT_LOGV("Integer field types differ: different byte orders: "
+ BT_LOGT("Integer field types differ: different byte orders: "
"ft-a-bo=%s, ft-b-bo=%s",
bt_ctf_byte_order_string(int_ft_a->user_byte_order),
bt_ctf_byte_order_string(int_ft_b->user_byte_order));
/* Signedness */
if (int_ft_a->is_signed != int_ft_b->is_signed) {
- BT_LOGV("Integer field types differ: different signedness: "
+ BT_LOGT("Integer field types differ: different signedness: "
"ft-a-is-signed=%d, ft-b-is-signed=%d",
int_ft_a->is_signed,
int_ft_b->is_signed);
/* Base */
if (int_ft_a->base != int_ft_b->base) {
- BT_LOGV("Integer field types differ: different bases: "
+ BT_LOGT("Integer field types differ: different bases: "
"ft-a-base=%s, ft-b-base=%s",
bt_ctf_integer_base_string(int_ft_a->base),
bt_ctf_integer_base_string(int_ft_b->base));
/* Encoding */
if (int_ft_a->encoding != int_ft_b->encoding) {
- BT_LOGV("Integer field types differ: different encodings: "
+ BT_LOGT("Integer field types differ: different encodings: "
"ft-a-encoding=%s, ft-b-encoding=%s",
bt_ctf_string_encoding_string(int_ft_a->encoding),
bt_ctf_string_encoding_string(int_ft_b->encoding));
/* Mapped clock class */
if (int_ft_a->mapped_clock_class) {
if (!int_ft_b->mapped_clock_class) {
- BT_LOGV_STR("Integer field types differ: field type A "
+ BT_LOGT_STR("Integer field types differ: field type A "
"has a mapped clock class, but field type B "
"does not.");
goto end;
if (bt_ctf_clock_class_compare(int_ft_a->mapped_clock_class,
int_ft_b->mapped_clock_class) != 0) {
- BT_LOGV_STR("Integer field types differ: different "
+ BT_LOGT_STR("Integer field types differ: different "
"mapped clock classes.");
}
} else {
if (int_ft_b->mapped_clock_class) {
- BT_LOGV_STR("Integer field types differ: field type A "
+ BT_LOGT_STR("Integer field types differ: field type A "
"has no description, but field type B has one.");
goto end;
}
/* Byte order */
if (flt_ft_a->user_byte_order != flt_ft_b->user_byte_order) {
- BT_LOGV("Floating point number field types differ: different byte orders: "
+ BT_LOGT("Floating point number field types differ: different byte orders: "
"ft-a-bo=%s, ft-b-bo=%s",
bt_ctf_byte_order_string(flt_ft_a->user_byte_order),
bt_ctf_byte_order_string(flt_ft_b->user_byte_order));
/* Exponent length */
if (flt_ft_a->exp_dig != flt_ft_b->exp_dig) {
- BT_LOGV("Floating point number field types differ: different exponent sizes: "
+ BT_LOGT("Floating point number field types differ: different exponent sizes: "
"ft-a-exp-size=%u, ft-b-exp-size=%u",
flt_ft_a->exp_dig, flt_ft_b->exp_dig);
goto end;
/* Mantissa length */
if (flt_ft_a->mant_dig != flt_ft_b->mant_dig) {
- BT_LOGV("Floating point number field types differ: different mantissa sizes: "
+ BT_LOGT("Floating point number field types differ: different mantissa sizes: "
"ft-a-mant-size=%u, ft-b-mant-size=%u",
flt_ft_a->mant_dig, flt_ft_b->mant_dig);
goto end;
/* Label */
if (mapping_a->string != mapping_b->string) {
- BT_LOGV("Enumeration field type mappings differ: different names: "
+ BT_LOGT("Enumeration field type mappings differ: different names: "
"mapping-a-name=\"%s\", mapping-b-name=\"%s\"",
g_quark_to_string(mapping_a->string),
g_quark_to_string(mapping_b->string));
/* Range start */
if (mapping_a->range_start._unsigned !=
mapping_b->range_start._unsigned) {
- BT_LOGV("Enumeration field type mappings differ: different starts of range: "
+ BT_LOGT("Enumeration field type mappings differ: different starts of range: "
"mapping-a-range-start-unsigned=%" PRIu64 ", "
"mapping-b-range-start-unsigned=%" PRIu64,
mapping_a->range_start._unsigned,
/* Range end */
if (mapping_a->range_end._unsigned !=
mapping_b->range_end._unsigned) {
- BT_LOGV("Enumeration field type mappings differ: different ends of range: "
+ BT_LOGT("Enumeration field type mappings differ: different ends of range: "
"mapping-a-range-end-unsigned=%" PRIu64 ", "
"mapping-b-range-end-unsigned=%" PRIu64,
mapping_a->range_end._unsigned,
BT_CTF_TO_COMMON(enum_ft_a->container_ft),
BT_CTF_TO_COMMON(enum_ft_b->container_ft));
if (ret) {
- BT_LOGV("Enumeration field types differ: different container field types: "
+ BT_LOGT("Enumeration field types differ: different container field types: "
"ft-a-container-ft-addr=%p, ft-b-container-ft-addr=%p",
enum_ft_a->container_ft, enum_ft_b->container_ft);
goto end;
g_ptr_array_index(enum_ft_b->entries, i);
if (compare_enumeration_mappings(mapping_a, mapping_b)) {
- BT_LOGV("Enumeration field types differ: different mappings: "
+ BT_LOGT("Enumeration field types differ: different mappings: "
"ft-a-mapping-addr=%p, ft-b-mapping-addr=%p, "
"ft-a-mapping-name=\"%s\", ft-b-mapping-name=\"%s\"",
mapping_a, mapping_b,
/* Encoding */
if (string_ft_a->encoding != string_ft_b->encoding) {
- BT_LOGV("String field types differ: different encodings: "
+ BT_LOGT("String field types differ: different encodings: "
"ft-a-encoding=%s, ft-b-encoding=%s",
bt_ctf_string_encoding_string(string_ft_a->encoding),
bt_ctf_string_encoding_string(string_ft_b->encoding));
/* Label */
if (member_a_name != member_b_name) {
- BT_LOGV("Structure/variant field type fields differ: different names: "
+ BT_LOGT("Structure/variant field type fields differ: different names: "
"field-a-name=%s, field-b-name=%s",
g_quark_to_string(member_a_name),
g_quark_to_string(member_b_name));
/* Type */
ret = bt_ctf_field_type_common_compare(member_a_ft, member_b_ft);
if (ret == 1) {
- BT_LOGV("Structure/variant field type fields differ: different field types: "
+ BT_LOGT("Structure/variant field type fields differ: different field types: "
"field-name=\"%s\", field-a-ft-addr=%p, field-b-ft-addr=%p",
g_quark_to_string(member_a_name),
member_a_ft, member_b_ft);
/* Alignment */
if (bt_ctf_field_type_common_get_alignment(ft_a) !=
bt_ctf_field_type_common_get_alignment(ft_b)) {
- BT_LOGV("Structure field types differ: different alignments: "
+ BT_LOGT("Structure field types differ: different alignments: "
"ft-a-align=%u, ft-b-align=%u",
bt_ctf_field_type_common_get_alignment(ft_a),
bt_ctf_field_type_common_get_alignment(ft_b));
/* Fields */
if (struct_ft_a->fields->len != struct_ft_b->fields->len) {
- BT_LOGV("Structure field types differ: different field counts: "
+ BT_LOGT("Structure field types differ: different field counts: "
"ft-a-field-count=%u, ft-b-field-count=%u",
struct_ft_a->fields->len, struct_ft_b->fields->len);
goto end;
field_b->type, field_a->name, field_b->name);
if (ret) {
/* compare_structure_variant_members() logs what differs */
- BT_LOGV_STR("Structure field types differ: different fields.");
+ BT_LOGT_STR("Structure field types differ: different fields.");
goto end;
}
}
/* Tag name */
if (strcmp(var_ft_a->tag_name->str, var_ft_b->tag_name->str)) {
- BT_LOGV("Variant field types differ: different tag field names: "
+ BT_LOGT("Variant field types differ: different tag field names: "
"ft-a-tag-field-name=\"%s\", ft-b-tag-field-name=\"%s\"",
var_ft_a->tag_name->str, var_ft_b->tag_name->str);
goto end;
ret = bt_ctf_field_type_common_compare(BT_CTF_TO_COMMON(var_ft_a->tag_ft),
BT_CTF_TO_COMMON(var_ft_b->tag_ft));
if (ret) {
- BT_LOGV("Variant field types differ: different tag field types: "
+ BT_LOGT("Variant field types differ: different tag field types: "
"ft-a-tag-ft-addr=%p, ft-b-tag-ft-addr=%p",
var_ft_a->tag_ft, var_ft_b->tag_ft);
goto end;
/* Fields */
if (var_ft_a->choices->len != var_ft_b->choices->len) {
- BT_LOGV("Variant field types differ: different field counts: "
+ BT_LOGT("Variant field types differ: different field counts: "
"ft-a-field-count=%u, ft-b-field-count=%u",
var_ft_a->choices->len, var_ft_b->choices->len);
goto end;
choice_b->type, choice_a->name, choice_b->name);
if (ret) {
/* compare_structure_variant_members() logs what differs */
- BT_LOGV_STR("Variant field types differ: different fields.");
+ BT_LOGT_STR("Variant field types differ: different fields.");
goto end;
}
}
/* Length */
if (array_ft_a->length != array_ft_b->length) {
- BT_LOGV("Structure field types differ: different lengths: "
+ BT_LOGT("Structure field types differ: different lengths: "
"ft-a-length=%u, ft-b-length=%u",
array_ft_a->length, array_ft_b->length);
goto end;
ret = bt_ctf_field_type_common_compare(array_ft_a->element_ft,
array_ft_b->element_ft);
if (ret == 1) {
- BT_LOGV("Array field types differ: different element field types: "
+ BT_LOGT("Array field types differ: different element field types: "
"ft-a-element-ft-addr=%p, ft-b-element-ft-addr=%p",
array_ft_a->element_ft, array_ft_b->element_ft);
}
/* Length name */
if (strcmp(seq_ft_a->length_field_name->str,
seq_ft_b->length_field_name->str)) {
- BT_LOGV("Sequence field types differ: different length field names: "
+ BT_LOGT("Sequence field types differ: different length field names: "
"ft-a-length-field-name=\"%s\", "
"ft-b-length-field-name=\"%s\"",
seq_ft_a->length_field_name->str,
ret = bt_ctf_field_type_common_compare(seq_ft_a->element_ft,
seq_ft_b->element_ft);
if (ret == 1) {
- BT_LOGV("Sequence field types differ: different element field types: "
+ BT_LOGT("Sequence field types differ: different element field types: "
"ft-a-element-ft-addr=%p, ft-b-element-ft-addr=%p",
seq_ft_a->element_ft, seq_ft_b->element_ft);
}
if (ft_a->id != ft_b->id) {
/* Different type IDs */
- BT_LOGV("Field types differ: different IDs: "
+ BT_LOGT("Field types differ: different IDs: "
"ft-a-addr=%p, ft-b-addr=%p, "
"ft-a-id=%s, ft-b-id=%s",
ft_a, ft_b,
goto end;
}
- BT_ASSERT(ft_a->methods->compare);
+ BT_ASSERT_DBG(ft_a->methods->compare);
ret = ft_a->methods->compare(ft_a, ft_b);
if (ret == 1) {
- BT_LOGV("Field types differ: ft-a-addr=%p, ft-b-addr=%p",
+ BT_LOGT("Field types differ: ft-a-addr=%p, ft-b-addr=%p",
ft_a, ft_b);
}
goto end;
}
- BT_ASSERT(expected_clock_class);
+ BT_ASSERT_DBG(expected_clock_class);
switch (ft->id) {
case BT_CTF_FIELD_TYPE_ID_INTEGER:
/* Move reference to output parameter */
*expected_clock_class = bt_ctf_object_get_ref(mapped_clock_class);
mapped_clock_class = NULL;
- BT_LOGV("Setting expected clock class: "
+ BT_LOGT("Setting expected clock class: "
"expected-clock-class-addr=%p",
*expected_clock_class);
} else {
break;
default:
BT_LOGF("Unexpected field type ID: id=%d", ft->id);
- abort();
+ bt_common_abort();
}
- BT_ASSERT(sub_ft);
+ BT_ASSERT_DBG(sub_ft);
ret = bt_ctf_field_type_common_validate_single_clock_class(sub_ft,
expected_clock_class);
break;
ret = bt_ctf_field_type_common_structure_borrow_field_by_index(
ft, &name, &member_type, i);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
ret = bt_ctf_field_type_common_validate_single_clock_class(
member_type, expected_clock_class);
if (ret) {
ret = bt_ctf_field_type_common_variant_borrow_field_by_index(
ft, &name, &member_type, i);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
ret = bt_ctf_field_type_common_validate_single_clock_class(
member_type, expected_clock_class);
if (ret) {
struct bt_ctf_field_type_common *type_common = (void *) type;
bt_ctf_field_type_serialize_func serialize_func;
- BT_ASSERT(type);
- BT_ASSERT(context);
+ BT_ASSERT_DBG(type);
+ BT_ASSERT_DBG(context);
/* Make sure field type is valid before serializing it */
ret = bt_ctf_field_type_common_validate((void *) type);
const char *clock_name = bt_ctf_clock_class_get_name(
integer->mapped_clock_class);
- BT_ASSERT(clock_name);
+ BT_ASSERT_DBG(clock_name);
g_string_append_printf(context->string,
"; map = clock.%s.value", clock_name);
}
"ft-addr=%p, metadata-context-addr=%p", type, context);
container_type =
bt_ctf_field_type_common_enumeration_borrow_container_field_type(type);
- BT_ASSERT(container_type);
+ BT_ASSERT_DBG(container_type);
container_signed = bt_ctf_field_type_common_integer_is_signed(
container_type);
- BT_ASSERT(container_signed >= 0);
+ BT_ASSERT_DBG(container_signed >= 0);
g_string_append(context->string, "enum : ");
BT_LOGD_STR("Serializing CTF writer enumeration field type's container field type's metadata.");
ret = bt_ctf_field_type_serialize_recursive(
return bt_ctf_field_type_common_integer_get_size((void *) ft);
}
-bt_bool bt_ctf_field_type_integer_is_signed(struct bt_ctf_field_type *ft)
+bt_ctf_bool bt_ctf_field_type_integer_is_signed(struct bt_ctf_field_type *ft)
{
return bt_ctf_field_type_common_integer_is_signed((void *) ft);
}
int bt_ctf_field_type_integer_set_is_signed(struct bt_ctf_field_type *ft,
- bt_bool is_signed)
+ bt_ctf_bool is_signed)
{
return bt_ctf_field_type_common_integer_set_is_signed((void *) ft,
is_signed);
"Tag field");
container = bt_ctf_field_enumeration_borrow_container(tag_field);
- BT_ASSERT(container);
+ BT_ASSERT_DBG(container);
if (var_ft->tag_ft->container_ft->is_signed) {
int64_t val;
ret = bt_ctf_field_integer_signed_get_value(container,
&val);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
choice_index = bt_ctf_field_type_common_variant_find_choice_index(
(void *) ft, (uint64_t) val, true);
} else {
ret = bt_ctf_field_integer_unsigned_get_value(container,
&val);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
choice_index = bt_ctf_field_type_common_variant_find_choice_index(
(void *) ft, val, false);
}
ret = bt_ctf_field_type_variant_get_field_by_index(ft, NULL,
&ret_ft, choice_index);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
end:
return ret_ft;
/* Copy ranges */
copy_entry->ranges = g_array_new(FALSE, TRUE,
sizeof(struct bt_ctf_field_type_common_variant_choice_range));
- BT_ASSERT(copy_entry->ranges);
+ BT_ASSERT_DBG(copy_entry->ranges);
g_array_set_size(copy_entry->ranges, entry->ranges->len);
for (range_i = 0; range_i < entry->ranges->len; range_i++) {
projects / babeltrace.git / blobdiff