#include <babeltrace/assert-internal.h>
#include <inttypes.h>
-static
-struct bt_field_common *bt_field_integer_copy(struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_enumeration_copy_recursive(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_floating_point_copy(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_structure_copy_recursive(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_variant_copy_recursive(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_array_copy_recursive(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_sequence_copy_recursive(
- struct bt_field_common *src);
-
-static
-struct bt_field_common *bt_field_string_copy(struct bt_field_common *src);
+#define BT_ASSERT_PRE_FIELD_IS_INT_OR_ENUM(_field, _name) \
+ BT_ASSERT_PRE((_field)->type->id == BT_FIELD_TYPE_ID_INTEGER || \
+ (_field)->type->id == BT_FIELD_TYPE_ID_ENUM, \
+ _name " is not an integer or an enumeration field: " \
+ "%!+f", (_field))
static struct bt_field_common_methods bt_field_integer_methods = {
- .freeze = bt_field_common_generic_freeze,
+ .set_is_frozen = bt_field_common_generic_set_is_frozen,
.validate = bt_field_common_generic_validate,
- .copy = bt_field_integer_copy,
+ .copy = NULL,
.is_set = bt_field_common_generic_is_set,
.reset = bt_field_common_generic_reset,
};
static struct bt_field_common_methods bt_field_floating_point_methods = {
- .freeze = bt_field_common_generic_freeze,
+ .set_is_frozen = bt_field_common_generic_set_is_frozen,
.validate = bt_field_common_generic_validate,
- .copy = bt_field_floating_point_copy,
+ .copy = NULL,
.is_set = bt_field_common_generic_is_set,
.reset = bt_field_common_generic_reset,
};
static struct bt_field_common_methods bt_field_enumeration_methods = {
- .freeze = bt_field_common_enumeration_freeze_recursive,
- .validate = bt_field_common_enumeration_validate_recursive,
- .copy = bt_field_enumeration_copy_recursive,
- .is_set = bt_field_common_enumeration_is_set_recursive,
- .reset = bt_field_common_enumeration_reset_recursive,
+ .set_is_frozen = bt_field_common_generic_set_is_frozen,
+ .validate = bt_field_common_generic_validate,
+ .copy = NULL,
+ .is_set = bt_field_common_generic_is_set,
+ .reset = bt_field_common_generic_reset,
};
static struct bt_field_common_methods bt_field_string_methods = {
- .freeze = bt_field_common_generic_freeze,
+ .set_is_frozen = bt_field_common_generic_set_is_frozen,
.validate = bt_field_common_generic_validate,
- .copy = bt_field_string_copy,
+ .copy = NULL,
.is_set = bt_field_common_generic_is_set,
.reset = bt_field_common_string_reset,
};
static struct bt_field_common_methods bt_field_structure_methods = {
- .freeze = bt_field_common_structure_freeze_recursive,
+ .set_is_frozen = bt_field_common_structure_set_is_frozen_recursive,
.validate = bt_field_common_structure_validate_recursive,
- .copy = bt_field_structure_copy_recursive,
+ .copy = NULL,
.is_set = bt_field_common_structure_is_set_recursive,
.reset = bt_field_common_structure_reset_recursive,
};
static struct bt_field_common_methods bt_field_sequence_methods = {
- .freeze = bt_field_common_sequence_freeze_recursive,
+ .set_is_frozen = bt_field_common_sequence_set_is_frozen_recursive,
.validate = bt_field_common_sequence_validate_recursive,
- .copy = bt_field_sequence_copy_recursive,
+ .copy = NULL,
.is_set = bt_field_common_sequence_is_set_recursive,
.reset = bt_field_common_sequence_reset_recursive,
};
static struct bt_field_common_methods bt_field_array_methods = {
- .freeze = bt_field_common_array_freeze_recursive,
+ .set_is_frozen = bt_field_common_array_set_is_frozen_recursive,
.validate = bt_field_common_array_validate_recursive,
- .copy = bt_field_array_copy_recursive,
+ .copy = NULL,
.is_set = bt_field_common_array_is_set_recursive,
.reset = bt_field_common_array_reset_recursive,
};
static struct bt_field_common_methods bt_field_variant_methods = {
- .freeze = bt_field_common_variant_freeze_recursive,
+ .set_is_frozen = bt_field_common_variant_set_is_frozen_recursive,
.validate = bt_field_common_variant_validate_recursive,
- .copy = bt_field_variant_copy_recursive,
+ .copy = NULL,
.is_set = bt_field_common_variant_is_set_recursive,
.reset = bt_field_common_variant_reset_recursive,
};
[BT_FIELD_TYPE_ID_STRING] = bt_field_string_create,
};
-struct bt_field *bt_field_create(struct bt_field_type *type)
+static
+void bt_field_integer_destroy(struct bt_field *field);
+
+static
+void bt_field_enumeration_destroy(struct bt_field *field);
+
+static
+void bt_field_floating_point_destroy(struct bt_field *field);
+
+static
+void bt_field_structure_destroy_recursive(struct bt_field *field);
+
+static
+void bt_field_variant_destroy_recursive(struct bt_field *field);
+
+static
+void bt_field_array_destroy_recursive(struct bt_field *field);
+
+static
+void bt_field_sequence_destroy_recursive(struct bt_field *field);
+
+static
+void bt_field_string_destroy(struct bt_field *field);
+
+static
+void (* const field_destroy_funcs[])(struct bt_field *) = {
+ [BT_FIELD_TYPE_ID_INTEGER] = bt_field_integer_destroy,
+ [BT_FIELD_TYPE_ID_ENUM] = bt_field_enumeration_destroy,
+ [BT_FIELD_TYPE_ID_FLOAT] = bt_field_floating_point_destroy,
+ [BT_FIELD_TYPE_ID_STRUCT] = bt_field_structure_destroy_recursive,
+ [BT_FIELD_TYPE_ID_VARIANT] = bt_field_variant_destroy_recursive,
+ [BT_FIELD_TYPE_ID_ARRAY] = bt_field_array_destroy_recursive,
+ [BT_FIELD_TYPE_ID_SEQUENCE] = bt_field_sequence_destroy_recursive,
+ [BT_FIELD_TYPE_ID_STRING] = bt_field_string_destroy,
+};
+
+BT_HIDDEN
+struct bt_field *bt_field_create_recursive(struct bt_field_type *type)
{
struct bt_field *field = NULL;
enum bt_field_type_id type_id;
goto end;
}
+ bt_object_set_is_shared((void *) field, false);
bt_field_type_freeze(type);
end:
return bt_field_get_type_id(field) == BT_FIELD_TYPE_ID_VARIANT;
}
-BT_HIDDEN
-int64_t bt_field_sequence_get_int_length(struct bt_field *field)
+int64_t bt_field_sequence_get_length(struct bt_field *field)
{
- return bt_field_common_sequence_get_int_length((void *) field);
+ return bt_field_common_sequence_get_length((void *) field);
}
-struct bt_field *bt_field_sequence_borrow_length(struct bt_field *field)
-{
- return (void *) bt_field_common_sequence_borrow_length((void *) field);
-}
-
-int bt_field_sequence_set_length(struct bt_field *field,
- struct bt_field *length_field)
+int bt_field_sequence_set_length(struct bt_field *field, uint64_t length)
{
return bt_field_common_sequence_set_length((void *) field,
- (void *) length_field);
+ length, (bt_field_common_create_func) bt_field_create_recursive);
}
struct bt_field *bt_field_structure_borrow_field_by_index(
(void *) field, name);
}
-int bt_field_structure_set_field_by_name(struct bt_field_common *field,
- const char *name, struct bt_field_common *value)
-{
- return bt_field_common_structure_set_field_by_name((void *) field,
- name, (void *) value);
-}
-
struct bt_field *bt_field_array_borrow_field(
struct bt_field *field, uint64_t index)
{
return (void *) bt_field_common_array_borrow_field((void *) field,
- index, (bt_field_common_create_func) bt_field_create);
+ index);
}
struct bt_field *bt_field_sequence_borrow_field(
struct bt_field *field, uint64_t index)
{
return (void *) bt_field_common_sequence_borrow_field((void *) field,
- index, (bt_field_common_create_func) bt_field_create);
-}
-
-struct bt_field *bt_field_variant_borrow_field(struct bt_field *field,
- struct bt_field *tag_field)
-{
- return (void *) bt_field_common_variant_borrow_field((void *) field,
- (void *) tag_field,
- (bt_field_common_create_func) bt_field_create);
+ index);
}
struct bt_field *bt_field_variant_borrow_current_field(
(void *) variant_field);
}
-struct bt_field_common *bt_field_variant_borrow_tag(
- struct bt_field_common *variant_field)
+int bt_field_variant_set_tag_signed(struct bt_field *variant_field,
+ int64_t tag)
{
- return (void *) bt_field_common_variant_borrow_tag(
- (void *) variant_field);
+ return bt_field_variant_common_set_tag((void *) variant_field,
+ (uint64_t) tag, true);
+}
+
+int bt_field_variant_set_tag_unsigned(struct bt_field *variant_field,
+ uint64_t tag)
+{
+ return bt_field_variant_common_set_tag((void *) variant_field,
+ (uint64_t) tag, false);
}
-struct bt_field *bt_field_enumeration_borrow_container(struct bt_field *field)
+int bt_field_variant_get_tag_signed(struct bt_field *variant_field,
+ int64_t *tag)
{
- return (void *) bt_field_common_enumeration_borrow_container(
- (void *) field, (bt_field_common_create_func) bt_field_create);
+ return bt_field_common_variant_get_tag_signed((void *) variant_field, tag);
+}
+
+int bt_field_variant_get_tag_unsigned(struct bt_field *variant_field,
+ uint64_t *tag)
+{
+ return bt_field_common_variant_get_tag_unsigned((void *) variant_field, tag);
}
struct bt_field_type_enumeration_mapping_iterator *
bt_field_enumeration_get_mappings(struct bt_field *field)
{
+ struct bt_field_enumeration *enum_field = (void *) field;
+
+ BT_ASSERT_PRE_NON_NULL(field, "Enumeration field");
+ BT_ASSERT_PRE_FIELD_COMMON_HAS_TYPE_ID((struct bt_field_common *) field,
+ BT_FIELD_TYPE_ID_ENUM, "Field");
+ BT_ASSERT_PRE_FIELD_COMMON_IS_SET((struct bt_field_common *) field,
+ "Enumeration field");
return bt_field_common_enumeration_get_mappings((void *) field,
- (bt_field_common_create_func) bt_field_create);
+ (bt_field_common_create_func) bt_field_create_recursive,
+ enum_field->common.payload.unsignd);
+}
+
+BT_ASSERT_PRE_FUNC
+static inline
+struct bt_field_type_common_integer *get_int_enum_int_ft(
+ struct bt_field *field)
+{
+ struct bt_field_common_integer *int_field = (void *) field;
+ struct bt_field_type_common_integer *int_ft = NULL;
+
+ if (int_field->common.type->id == BT_FIELD_TYPE_ID_INTEGER) {
+ int_ft = BT_FROM_COMMON(int_field->common.type);
+ } else if (int_field->common.type->id == BT_FIELD_TYPE_ID_ENUM) {
+ struct bt_field_type_common_enumeration *enum_ft =
+ BT_FROM_COMMON(int_field->common.type);
+ int_ft = enum_ft->container_ft;
+ }
+
+ BT_ASSERT(int_ft);
+ return int_ft;
}
int bt_field_integer_signed_get_value(struct bt_field *field, int64_t *value)
{
- return bt_field_common_integer_signed_get_value((void *) field, value);
+ struct bt_field_common_integer *integer = (void *) field;
+
+ BT_ASSERT_PRE_NON_NULL(field, "Integer/enumeration field");
+ BT_ASSERT_PRE_NON_NULL(value, "Value");
+ BT_ASSERT_PRE_FIELD_COMMON_IS_SET(BT_TO_COMMON(integer),
+ "Integer/enumeration field");
+ BT_ASSERT_PRE_FIELD_IS_INT_OR_ENUM(BT_TO_COMMON(integer), "Field");
+ BT_ASSERT_PRE(bt_field_type_common_integer_is_signed(
+ BT_TO_COMMON(get_int_enum_int_ft(field))),
+ "Field's type is unsigned: %!+f", field);
+ *value = integer->payload.signd;
+ return 0;
}
-int bt_field_integer_signed_set_value(struct bt_field *field,
- int64_t value)
+int bt_field_integer_signed_set_value(struct bt_field *field, int64_t value)
{
- return bt_field_common_integer_signed_set_value((void *) field, value);
+ int ret = 0;
+ struct bt_field_common_integer *integer = (void *) field;
+
+ BT_ASSERT_PRE_NON_NULL(field, "Integer field");
+ BT_ASSERT_PRE_FIELD_COMMON_HOT(BT_TO_COMMON(integer), "Integer field");
+ BT_ASSERT_PRE_FIELD_IS_INT_OR_ENUM(BT_TO_COMMON(integer), "Field");
+ BT_ASSERT_PRE(bt_field_type_common_integer_is_signed(
+ BT_FROM_COMMON(get_int_enum_int_ft(field))),
+ "Field's type is unsigned: %!+f", field);
+ BT_ASSERT_PRE(value_is_in_range_signed(
+ get_int_enum_int_ft(field)->size, value),
+ "Value is out of bounds: value=%" PRId64 ", %![field-]+f",
+ value, field);
+ integer->payload.signd = value;
+ bt_field_set(field, true);
+ return ret;
}
-int bt_field_integer_unsigned_get_value(struct bt_field *field,
- uint64_t *value)
+int bt_field_integer_unsigned_get_value(struct bt_field *field, uint64_t *value)
{
- return bt_field_common_integer_unsigned_get_value((void *) field,
- value);
+ struct bt_field_common_integer *integer = (void *) field;
+
+ BT_ASSERT_PRE_NON_NULL(field, "Integer field");
+ BT_ASSERT_PRE_NON_NULL(value, "Value");
+ BT_ASSERT_PRE_FIELD_COMMON_IS_SET(BT_TO_COMMON(integer), "Integer field");
+ BT_ASSERT_PRE_FIELD_IS_INT_OR_ENUM(BT_TO_COMMON(integer), "Field");
+ BT_ASSERT_PRE(!bt_field_type_common_integer_is_signed(
+ BT_FROM_COMMON(get_int_enum_int_ft(field))),
+ "Field's type is signed: %!+f", field);
+ *value = integer->payload.unsignd;
+ return 0;
}
-int bt_field_integer_unsigned_set_value(struct bt_field *field, uint64_t value)
+int bt_field_integer_unsigned_set_value(struct bt_field *field,
+ uint64_t value)
{
- return bt_field_common_integer_unsigned_set_value((void *) field, value);
+ struct bt_field_common_integer *integer = (void *) field;
+
+ BT_ASSERT_PRE_NON_NULL(field, "Integer field");
+ BT_ASSERT_PRE_FIELD_COMMON_HOT(BT_TO_COMMON(integer), "Integer field");
+ BT_ASSERT_PRE_FIELD_IS_INT_OR_ENUM(BT_TO_COMMON(integer), "Field");
+ BT_ASSERT_PRE(!bt_field_type_common_integer_is_signed(
+ BT_FROM_COMMON(get_int_enum_int_ft(field))),
+ "Field's type is signed: %!+f", field);
+ BT_ASSERT_PRE(value_is_in_range_unsigned(
+ get_int_enum_int_ft(field)->size, value),
+ "Value is out of bounds: value=%" PRIu64 ", %![field-]+f",
+ value, field);
+ integer->payload.unsignd = value;
+ bt_field_set(field, true);
+ return 0;
}
int bt_field_floating_point_get_value(struct bt_field *field,
return bt_field_common_string_append_len((void *) field, value, length);
}
+int bt_field_string_clear(struct bt_field *string_field)
+{
+ return bt_field_common_string_clear((void *) string_field);
+}
+
BT_HIDDEN
struct bt_field_common *bt_field_common_copy(struct bt_field_common *field)
{
return copy;
}
-struct bt_field *bt_field_copy(struct bt_field *field)
-{
- return (void *) bt_field_common_copy((void *) field);
-}
-
-static void bt_field_common_finalize(struct bt_field_common *field)
+static
+void bt_field_integer_destroy(struct bt_field *field)
{
- BT_ASSERT(field);
- BT_LOGD_STR("Putting field's type.");
- bt_put(field->type);
+ BT_LOGD("Destroying integer field object: addr=%p", field);
+ bt_field_common_integer_finalize((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_integer_destroy(struct bt_object *obj)
+static
+void bt_field_floating_point_destroy(struct bt_field *field)
{
- struct bt_field_common_integer *integer = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(integer));
- BT_LOGD("Destroying integer field object: addr=%p", obj);
- g_free(obj);
+ BT_LOGD("Destroying floating point field object: addr=%p", field);
+ bt_field_common_floating_point_finalize((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_enumeration_destroy_recursive(struct bt_object *obj)
+static
+void bt_field_enumeration_destroy(struct bt_field *field)
{
- struct bt_field_common_enumeration *enumeration = (void *) obj;
-
- BT_ASSERT(enumeration);
- bt_field_common_finalize(BT_TO_COMMON(enumeration));
- BT_LOGD("Destroying enumeration field object: addr=%p", obj);
- BT_LOGD_STR("Putting payload field.");
- bt_put(enumeration->payload);
- g_free(enumeration);
+ BT_LOGD("Destroying enumeration field object: addr=%p", field);
+ bt_field_common_finalize((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_floating_point_destroy(struct bt_object *obj)
+static
+void bt_field_structure_destroy_recursive(struct bt_field *field)
{
- struct bt_field_common_floating_point *floating_point = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(floating_point));
- BT_LOGD("Destroying floating point number field object: addr=%p", obj);
- g_free(obj);
+ BT_LOGD("Destroying structure field object: addr=%p", field);
+ bt_field_common_structure_finalize_recursive((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_structure_destroy_recursive(struct bt_object *obj)
+static
+void bt_field_variant_destroy_recursive(struct bt_field *field)
{
- struct bt_field_common_structure *structure = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(structure));
- BT_LOGD("Destroying structure field object: addr=%p", obj);
- g_ptr_array_free(structure->fields, TRUE);
- g_free(structure);
+ BT_LOGD("Destroying variant field object: addr=%p", field);
+ bt_field_common_variant_finalize_recursive((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_variant_destroy_recursive(struct bt_object *obj)
+static
+void bt_field_array_destroy_recursive(struct bt_field *field)
{
- struct bt_field_common_variant *variant = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(variant));
- BT_LOGD("Destroying variant field object: addr=%p", obj);
- BT_LOGD_STR("Putting tag field.");
- bt_put(variant->tag);
- BT_LOGD_STR("Putting payload field.");
- bt_put(variant->payload);
- g_free(variant);
+ BT_LOGD("Destroying array field object: addr=%p", field);
+ bt_field_common_array_finalize_recursive((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_array_destroy_recursive(struct bt_object *obj)
+static
+void bt_field_sequence_destroy_recursive(struct bt_field *field)
{
- struct bt_field_common_array *array = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(array));
- BT_LOGD("Destroying array field object: addr=%p", obj);
- g_ptr_array_free(array->elements, TRUE);
- g_free(array);
+ BT_LOGD("Destroying sequence field object: addr=%p", field);
+ bt_field_common_sequence_finalize_recursive((void *) field);
+ g_free(field);
}
-BT_HIDDEN
-void bt_field_common_sequence_destroy_recursive(struct bt_object *obj)
+static
+void bt_field_string_destroy(struct bt_field *field)
{
- struct bt_field_common_sequence *sequence = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(sequence));
- BT_LOGD("Destroying sequence field object: addr=%p", obj);
-
- if (sequence->elements) {
- g_ptr_array_free(sequence->elements, TRUE);
- }
-
- BT_LOGD_STR("Putting length field.");
- bt_put(sequence->length);
- g_free(sequence);
+ BT_LOGD("Destroying string field object: addr=%p", field);
+ bt_field_common_string_finalize((void *) field);
+ g_free(field);
}
BT_HIDDEN
-void bt_field_common_string_destroy(struct bt_object *obj)
+void bt_field_destroy_recursive(struct bt_field *field)
{
- struct bt_field_common_string *string = (void *) obj;
-
- BT_ASSERT(obj);
- bt_field_common_finalize(BT_TO_COMMON(string));
- BT_LOGD("Destroying string field object: addr=%p", obj);
+ struct bt_field_common *field_common = (void *) field;
- if (string->payload) {
- g_string_free(string->payload, TRUE);
+ if (!field) {
+ return;
}
- g_free(string);
+ BT_ASSERT(field_type_common_has_known_id((void *) field_common->type));
+ field_destroy_funcs[field_common->type->id](field);
}
static
if (integer) {
bt_field_common_initialize(BT_TO_COMMON(integer), (void *) type,
- bt_field_common_integer_destroy,
- &bt_field_integer_methods);
+ NULL, &bt_field_integer_methods);
BT_LOGD("Created integer field object: addr=%p, ft-addr=%p",
integer, type);
} else {
static
struct bt_field *bt_field_enumeration_create(struct bt_field_type *type)
{
- struct bt_field_common_enumeration *enumeration = g_new0(
- struct bt_field_common_enumeration, 1);
+ struct bt_field_enumeration *enumeration = g_new0(
+ struct bt_field_enumeration, 1);
BT_LOGD("Creating enumeration field object: ft-addr=%p", type);
if (enumeration) {
- bt_field_common_initialize(BT_TO_COMMON(enumeration),
- (void *) type,
- bt_field_common_enumeration_destroy_recursive,
- &bt_field_enumeration_methods);
+ bt_field_common_initialize(
+ BT_TO_COMMON(BT_TO_COMMON(enumeration)),
+ (void *) type, NULL, &bt_field_enumeration_methods);
BT_LOGD("Created enumeration field object: addr=%p, ft-addr=%p",
enumeration, type);
} else {
if (floating_point) {
bt_field_common_initialize(BT_TO_COMMON(floating_point),
- (void *) type,
- bt_field_common_floating_point_destroy,
- &bt_field_floating_point_methods);
+ (void *) type, NULL, &bt_field_floating_point_methods);
BT_LOGD("Created floating point number field object: addr=%p, ft-addr=%p",
floating_point, type);
} else {
struct bt_field_type_common *type,
bt_object_release_func release_func,
struct bt_field_common_methods *methods,
- bt_field_common_create_func field_create_func)
+ bt_field_common_create_func field_create_func,
+ GDestroyNotify field_release_func)
{
int ret = 0;
struct bt_field_type_common_structure *structure_type =
BT_LOGD("Initializing common structure field object: ft-addr=%p", type);
bt_field_common_initialize(field, type, release_func, methods);
- structure->fields = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_put);
+ structure->fields = g_ptr_array_new_with_free_func(field_release_func);
g_ptr_array_set_size(structure->fields, structure_type->fields->len);
- /* Create all fields contained by the structure field. */
+ /* Create all fields contained in the structure field. */
for (i = 0; i < structure_type->fields->len; i++) {
struct bt_field_common *field;
- struct structure_field_common *struct_field =
- g_ptr_array_index(structure_type->fields, i);
-
+ struct bt_field_type_common_structure_field *struct_field =
+ BT_FIELD_TYPE_COMMON_STRUCTURE_FIELD_AT_INDEX(
+ structure_type, i);
field = field_create_func(struct_field->type);
if (!field) {
BT_LOGE("Failed to create structure field's member: name=\"%s\", index=%zu",
}
iret = bt_field_common_structure_initialize(BT_TO_COMMON(structure),
- (void *) type, bt_field_common_structure_destroy_recursive,
- &bt_field_structure_methods,
- (bt_field_common_create_func) bt_field_create);
+ (void *) type, NULL, &bt_field_structure_methods,
+ (bt_field_common_create_func) bt_field_create_recursive,
+ (GDestroyNotify) bt_field_destroy_recursive);
if (iret) {
BT_PUT(structure);
goto end;
return (void *) structure;
}
+BT_HIDDEN
+int bt_field_common_variant_initialize(struct bt_field_common *field,
+ struct bt_field_type_common *type,
+ bt_object_release_func release_func,
+ struct bt_field_common_methods *methods,
+ bt_field_common_create_func field_create_func,
+ GDestroyNotify field_release_func)
+{
+ int ret = 0;
+ struct bt_field_type_common_variant *variant_type =
+ BT_FROM_COMMON(type);
+ struct bt_field_common_variant *variant = BT_FROM_COMMON(field);
+ size_t i;
+
+ BT_LOGD("Initializing common variant field object: ft-addr=%p", type);
+ bt_field_common_initialize(field, type, release_func, methods);
+ ret = bt_field_type_common_variant_update_choices(type);
+ if (ret) {
+ BT_LOGE("Cannot update common variant field type choices: "
+ "ret=%d", ret);
+ goto end;
+ }
+
+ variant->fields = g_ptr_array_new_with_free_func(field_release_func);
+ g_ptr_array_set_size(variant->fields, variant_type->choices->len);
+
+ /* Create all fields contained in the variant field. */
+ for (i = 0; i < variant_type->choices->len; i++) {
+ struct bt_field_common *field;
+ struct bt_field_type_common_variant_choice *var_choice =
+ BT_FIELD_TYPE_COMMON_VARIANT_CHOICE_AT_INDEX(
+ variant_type, i);
+
+ field = field_create_func(var_choice->type);
+ if (!field) {
+ BT_LOGE("Failed to create variant field's member: name=\"%s\", index=%zu",
+ g_quark_to_string(var_choice->name), i);
+ ret = -1;
+ goto end;
+ }
+
+ g_ptr_array_index(variant->fields, i) = field;
+ }
+
+ BT_LOGD("Initialized common variant field object: addr=%p, ft-addr=%p",
+ field, type);
+
+end:
+ return ret;
+}
+
static
struct bt_field *bt_field_variant_create(struct bt_field_type *type)
{
struct bt_field_common_variant *variant = g_new0(
struct bt_field_common_variant, 1);
+ int iret;
BT_LOGD("Creating variant field object: ft-addr=%p", type);
- if (variant) {
- bt_field_common_initialize(BT_TO_COMMON(variant),
- (void *) type,
- bt_field_common_variant_destroy_recursive,
- &bt_field_variant_methods);
- BT_LOGD("Created variant field object: addr=%p, ft-addr=%p",
- variant, type);
- } else {
+ if (!variant) {
BT_LOGE_STR("Failed to allocate one variant field.");
+ goto end;
+ }
+
+ iret = bt_field_common_variant_initialize(BT_TO_COMMON(variant),
+ (void *) type, NULL, &bt_field_variant_methods,
+ (bt_field_common_create_func) bt_field_create_recursive,
+ (GDestroyNotify) bt_field_destroy_recursive);
+ if (iret) {
+ BT_PUT(variant);
+ goto end;
}
+ BT_LOGD("Created variant field object: addr=%p, ft-addr=%p",
+ variant, type);
+
+end:
return (void *) variant;
}
int bt_field_common_array_initialize(struct bt_field_common *field,
struct bt_field_type_common *type,
bt_object_release_func release_func,
- struct bt_field_common_methods *methods)
+ struct bt_field_common_methods *methods,
+ bt_field_common_create_func field_create_func,
+ GDestroyNotify field_destroy_func)
{
struct bt_field_type_common_array *array_type = BT_FROM_COMMON(type);
struct bt_field_common_array *array = BT_FROM_COMMON(field);
unsigned int array_length;
int ret = 0;
+ uint64_t i;
BT_LOGD("Initializing common array field object: ft-addr=%p", type);
BT_ASSERT(type);
goto end;
}
- g_ptr_array_set_free_func(array->elements, (GDestroyNotify) bt_put);
+ g_ptr_array_set_free_func(array->elements, field_destroy_func);
g_ptr_array_set_size(array->elements, array_length);
+
+ for (i = 0; i < array_length; i++) {
+ array->elements->pdata[i] = field_create_func(
+ array_type->element_ft);
+ if (!array->elements->pdata[i]) {
+ ret = -1;
+ goto end;
+ }
+ }
+
BT_LOGD("Initialized common array field object: addr=%p, ft-addr=%p",
field, type);
}
ret = bt_field_common_array_initialize(BT_TO_COMMON(array),
- (void *) type,
- bt_field_common_array_destroy_recursive,
- &bt_field_array_methods);
+ (void *) type, NULL, &bt_field_array_methods,
+ (bt_field_common_create_func) bt_field_create_recursive,
+ (GDestroyNotify) bt_field_destroy_recursive);
if (ret) {
BT_PUT(array);
goto end;
return (void *) array;
}
+BT_HIDDEN
+int bt_field_common_sequence_initialize(struct bt_field_common *field,
+ struct bt_field_type_common *type,
+ bt_object_release_func release_func,
+ struct bt_field_common_methods *methods,
+ GDestroyNotify field_destroy_func)
+{
+ struct bt_field_common_sequence *sequence = BT_FROM_COMMON(field);
+ int ret = 0;
+
+ BT_LOGD("Initializing common sequence field object: ft-addr=%p", type);
+ BT_ASSERT(type);
+ bt_field_common_initialize(field, type, release_func, methods);
+ sequence->elements = g_ptr_array_new();
+ if (!sequence->elements) {
+ ret = -1;
+ goto end;
+ }
+
+ g_ptr_array_set_free_func(sequence->elements, field_destroy_func);
+ BT_LOGD("Initialized common sequence field object: addr=%p, ft-addr=%p",
+ field, type);
+
+end:
+ return ret;
+}
+
static
struct bt_field *bt_field_sequence_create(struct bt_field_type *type)
{
- struct bt_field_common_sequence *sequence = g_new0(
- struct bt_field_common_sequence, 1);
+ struct bt_field_common_sequence *sequence =
+ g_new0(struct bt_field_common_sequence, 1);
+ int ret;
BT_LOGD("Creating sequence field object: ft-addr=%p", type);
+ BT_ASSERT(type);
- if (sequence) {
- bt_field_common_initialize(BT_TO_COMMON(sequence),
- (void *) type,
- bt_field_common_sequence_destroy_recursive,
- &bt_field_sequence_methods);
- BT_LOGD("Created sequence field object: addr=%p, ft-addr=%p",
- sequence, type);
- } else {
+ if (!sequence) {
BT_LOGE_STR("Failed to allocate one sequence field.");
+ goto end;
}
+ ret = bt_field_common_sequence_initialize(BT_TO_COMMON(sequence),
+ (void *) type, NULL, &bt_field_sequence_methods,
+ (GDestroyNotify) bt_field_destroy_recursive);
+ if (ret) {
+ BT_PUT(sequence);
+ goto end;
+ }
+
+ BT_LOGD("Created sequence field object: addr=%p, ft-addr=%p",
+ sequence, type);
+
+end:
return (void *) sequence;
}
if (string) {
bt_field_common_initialize(BT_TO_COMMON(string),
- (void *) type,
- bt_field_common_string_destroy,
- &bt_field_string_methods);
+ (void *) type, NULL, &bt_field_string_methods);
BT_LOGD("Created string field object: addr=%p, ft-addr=%p",
string, type);
} else {
return (field && field->payload_set) ? 0 : -1;
}
-BT_HIDDEN
-int bt_field_common_enumeration_validate_recursive(
- struct bt_field_common *field)
-{
- int ret;
- struct bt_field_common_enumeration *enumeration = BT_FROM_COMMON(field);
-
- BT_ASSERT(field);
-
- if (!enumeration->payload) {
- BT_ASSERT_PRE_MSG("Invalid enumeration field: payload is not set: "
- "%!+_f", field);
- ret = -1;
- goto end;
- }
-
- ret = bt_field_common_validate_recursive(enumeration->payload);
-
-end:
- return ret;
-}
-
BT_HIDDEN
int bt_field_common_structure_validate_recursive(struct bt_field_common *field)
{
struct bt_field_common_variant *variant = BT_FROM_COMMON(field);
BT_ASSERT(field);
- ret = bt_field_common_validate_recursive(variant->payload);
- if (ret) {
- BT_ASSERT_PRE_MSG("Invalid variant field's payload field: "
- "%![variant-field-]+_f, %![payload-field-]+_f",
- field, variant->payload);
+
+ if (!variant->current_field) {
+ ret = -1;
+ goto end;
}
+ ret = bt_field_common_validate_recursive(variant->current_field);
+
+end:
return ret;
}
field->payload_set = false;
}
-BT_HIDDEN
-void bt_field_common_enumeration_reset_recursive(struct bt_field_common *field)
-{
- struct bt_field_common_enumeration *enumeration = BT_FROM_COMMON(field);
-
- BT_ASSERT(field);
-
- if (!enumeration->payload) {
- return;
- }
-
- bt_field_common_reset_recursive(enumeration->payload);
-}
-
BT_HIDDEN
void bt_field_common_structure_reset_recursive(struct bt_field_common *field)
{
struct bt_field_common_variant *variant = BT_FROM_COMMON(field);
BT_ASSERT(field);
- BT_PUT(variant->tag);
- BT_PUT(variant->payload);
+ variant->current_field = NULL;
}
BT_HIDDEN
void bt_field_common_sequence_reset_recursive(struct bt_field_common *field)
{
struct bt_field_common_sequence *sequence = BT_FROM_COMMON(field);
+ uint64_t i;
BT_ASSERT(field);
- if (sequence->elements) {
- g_ptr_array_free(sequence->elements, TRUE);
- sequence->elements = NULL;
+ for (i = 0; i < sequence->elements->len; i++) {
+ if (sequence->elements->pdata[i]) {
+ bt_field_common_reset_recursive(
+ sequence->elements->pdata[i]);
+ }
}
- BT_PUT(sequence->length);
+ sequence->length = 0;
}
BT_HIDDEN
}
}
-static
-struct bt_field_common *bt_field_integer_copy(struct bt_field_common *src)
-{
- struct bt_field_common_integer *integer_src = (void *) src;
- struct bt_field_common_integer *integer_dst;
-
- BT_LOGD("Copying integer field: src-field-addr=%p", src);
- integer_dst = (void *) bt_field_create((void *) src->type);
- if (!integer_dst) {
- goto end;
- }
-
- integer_dst->payload = integer_src->payload;
- BT_LOGD_STR("Copied integer field.");
-
-end:
- return BT_TO_COMMON(integer_dst);
-}
-
-static
-struct bt_field_common *bt_field_enumeration_copy_recursive(
- struct bt_field_common *src)
-{
- struct bt_field_common_enumeration *enum_src = BT_FROM_COMMON(src);
- struct bt_field_common_enumeration *enum_dst;
-
- BT_LOGD("Copying enumeration field: src-field-addr=%p", src);
- enum_dst = (void *) bt_field_create((void *) src->type);
- if (!enum_dst) {
- goto error;
- }
-
- if (enum_src->payload) {
- BT_LOGD_STR("Copying enumeration field's payload field.");
- enum_dst->payload = (void *)
- bt_field_copy((void *) enum_src->payload);
- if (!enum_dst->payload) {
- BT_LOGE_STR("Cannot copy enumeration field's payload field.");
- goto error;
- }
- }
-
- BT_LOGD_STR("Copied enumeration field.");
- goto end;
-
-error:
- BT_PUT(enum_dst);
-
-end:
- return BT_TO_COMMON(enum_dst);
-}
-
-static
-struct bt_field_common *bt_field_floating_point_copy(
- struct bt_field_common *src)
-{
- struct bt_field_common_floating_point *float_src = BT_FROM_COMMON(src);
- struct bt_field_common_floating_point *float_dst;
-
- BT_LOGD("Copying floating point number field: src-field-addr=%p", src);
- float_dst = (void *) bt_field_create((void *) src->type);
- if (!float_dst) {
- goto end;
- }
-
- float_dst->payload = float_src->payload;
- BT_LOGD_STR("Copied floating point number field.");
-
-end:
- return BT_TO_COMMON(float_dst);
-}
-
-static
-struct bt_field_common *bt_field_structure_copy_recursive(
- struct bt_field_common *src)
-{
- int64_t i;
- struct bt_field_common_structure *struct_src = BT_FROM_COMMON(src);
- struct bt_field_common_structure *struct_dst;
-
- BT_LOGD("Copying structure field: src-field-addr=%p", src);
- struct_dst = (void *) bt_field_create((void *) src->type);
- if (!struct_dst) {
- goto error;
- }
-
- g_ptr_array_set_size(struct_dst->fields, struct_src->fields->len);
-
- for (i = 0; i < struct_src->fields->len; i++) {
- struct bt_field_common *field =
- g_ptr_array_index(struct_src->fields, i);
- struct bt_field_common *field_copy = NULL;
-
- if (field) {
- BT_LOGD("Copying structure field's field: src-field-addr=%p"
- "index=%" PRId64, field, i);
- field_copy = (void *) bt_field_copy((void *) field);
- if (!field_copy) {
- BT_LOGE("Cannot copy structure field's field: "
- "src-field-addr=%p, index=%" PRId64,
- field, i);
- goto error;
- }
- }
-
- BT_MOVE(g_ptr_array_index(struct_dst->fields, i), field_copy);
- }
-
- BT_LOGD_STR("Copied structure field.");
- goto end;
-
-error:
- BT_PUT(struct_dst);
-
-end:
- return BT_TO_COMMON(struct_dst);
-}
-
-static
-struct bt_field_common *bt_field_variant_copy_recursive(
- struct bt_field_common *src)
-{
- struct bt_field_common_variant *variant_src = BT_FROM_COMMON(src);
- struct bt_field_common_variant *variant_dst;
-
- BT_LOGD("Copying variant field: src-field-addr=%p", src);
- variant_dst = (void *) bt_field_create((void *) src->type);
- if (!variant_dst) {
- goto end;
- }
-
- if (variant_src->tag) {
- BT_LOGD_STR("Copying variant field's tag field.");
- variant_dst->tag = (void *) bt_field_copy(
- (void *) variant_src->tag);
- if (!variant_dst->tag) {
- BT_LOGE_STR("Cannot copy variant field's tag field.");
- goto error;
- }
- }
- if (variant_src->payload) {
- BT_LOGD_STR("Copying variant field's payload field.");
- variant_dst->payload = (void *) bt_field_copy(
- (void *) variant_src->payload);
- if (!variant_dst->payload) {
- BT_LOGE_STR("Cannot copy variant field's payload field.");
- goto error;
- }
- }
-
- BT_LOGD_STR("Copied variant field.");
- goto end;
-
-error:
- BT_PUT(variant_dst);
-
-end:
- return BT_TO_COMMON(variant_dst);
-}
-
-static
-struct bt_field_common *bt_field_array_copy_recursive(
- struct bt_field_common *src)
-{
- int64_t i;
- struct bt_field_common_array *array_src = BT_FROM_COMMON(src);
- struct bt_field_common_array *array_dst;
-
- BT_LOGD("Copying array field: src-field-addr=%p", src);
- array_dst = (void *) bt_field_create((void *) src->type);
- if (!array_dst) {
- goto error;
- }
-
- g_ptr_array_set_size(array_dst->elements, array_src->elements->len);
- for (i = 0; i < array_src->elements->len; i++) {
- struct bt_field_common *field =
- g_ptr_array_index(array_src->elements, i);
- struct bt_field_common *field_copy = NULL;
-
- if (field) {
- BT_LOGD("Copying array field's element field: field-addr=%p, "
- "index=%" PRId64, field, i);
- field_copy = (void *) bt_field_copy((void *) field);
- if (!field_copy) {
- BT_LOGE("Cannot copy array field's element field: "
- "src-field-addr=%p, index=%" PRId64,
- field, i);
- goto error;
- }
- }
-
- g_ptr_array_index(array_dst->elements, i) = field_copy;
- }
-
- BT_LOGD_STR("Copied array field.");
- goto end;
-
-error:
- BT_PUT(array_dst);
-
-end:
- return BT_TO_COMMON(array_dst);
-}
-
-static
-struct bt_field_common *bt_field_sequence_copy_recursive(
- struct bt_field_common *src)
-{
- int ret = 0;
- int64_t i;
- struct bt_field_common_sequence *sequence_src = BT_FROM_COMMON(src);
- struct bt_field_common_sequence *sequence_dst;
- struct bt_field_common *src_length;
- struct bt_field_common *dst_length;
-
- BT_LOGD("Copying sequence field: src-field-addr=%p", src);
- sequence_dst = (void *) bt_field_create((void *) src->type);
- if (!sequence_dst) {
- goto error;
- }
-
- src_length = bt_field_common_sequence_borrow_length(src);
- if (!src_length) {
- /* no length set yet: keep destination sequence empty */
- goto end;
- }
-
- /* copy source length */
- BT_LOGD_STR("Copying sequence field's length field.");
- dst_length = (void *) bt_field_copy((void *) src_length);
- if (!dst_length) {
- BT_LOGE_STR("Cannot copy sequence field's length field.");
- goto error;
- }
-
- /* this will initialize the destination sequence's internal array */
- ret = bt_field_common_sequence_set_length(
- BT_TO_COMMON(sequence_dst), dst_length);
- bt_put(dst_length);
- if (ret) {
- BT_LOGE("Cannot set sequence field copy's length field: "
- "dst-length-field-addr=%p", dst_length);
- goto error;
- }
-
- BT_ASSERT(sequence_dst->elements->len == sequence_src->elements->len);
-
- for (i = 0; i < sequence_src->elements->len; i++) {
- struct bt_field_common *field =
- g_ptr_array_index(sequence_src->elements, i);
- struct bt_field_common *field_copy = NULL;
-
- if (field) {
- BT_LOGD("Copying sequence field's element field: field-addr=%p, "
- "index=%" PRId64, field, i);
- field_copy = (void *) bt_field_copy((void *) field);
- if (!field_copy) {
- BT_LOGE("Cannot copy sequence field's element field: "
- "src-field-addr=%p, index=%" PRId64,
- field, i);
- goto error;
- }
- }
-
- g_ptr_array_index(sequence_dst->elements, i) = field_copy;
- }
-
- BT_LOGD_STR("Copied sequence field.");
- goto end;
-
-error:
- BT_PUT(sequence_dst);
-
-end:
- return BT_TO_COMMON(sequence_dst);
-}
-
-static
-struct bt_field_common *bt_field_string_copy(struct bt_field_common *src)
-{
- struct bt_field_common_string *string_src = BT_FROM_COMMON(src);
- struct bt_field_common_string *string_dst;
-
- BT_LOGD("Copying string field: src-field-addr=%p", src);
- string_dst = (void *) bt_field_create((void *) src->type);
- if (!string_dst) {
- goto error;
- }
-
- if (string_src->payload) {
- string_dst->payload = g_string_new(string_src->payload->str);
- if (!string_dst->payload) {
- BT_LOGE_STR("Failed to allocate a GString.");
- goto error;
- }
- }
-
- BT_LOGD_STR("Copied string field.");
- goto end;
-
-error:
- BT_PUT(string_dst);
-
-end:
- return BT_TO_COMMON(string_dst);
-}
-
BT_HIDDEN
-void bt_field_common_generic_freeze(struct bt_field_common *field)
+void bt_field_common_generic_set_is_frozen(struct bt_field_common *field,
+ bool is_frozen)
{
- field->frozen = true;
+ field->frozen = is_frozen;
}
BT_HIDDEN
-void bt_field_common_enumeration_freeze_recursive(struct bt_field_common *field)
+void bt_field_common_structure_set_is_frozen_recursive(
+ struct bt_field_common *field, bool is_frozen)
{
- struct bt_field_common_enumeration *enum_field = BT_FROM_COMMON(field);
-
- BT_LOGD("Freezing enumeration field object: addr=%p", field);
- BT_LOGD("Freezing enumeration field object's contained payload field: payload-field-addr=%p", enum_field->payload);
- bt_field_common_freeze_recursive(enum_field->payload);
- bt_field_common_generic_freeze(field);
-}
-
-BT_HIDDEN
-void bt_field_common_structure_freeze_recursive(struct bt_field_common *field)
-{
- int64_t i;
+ uint64_t i;
struct bt_field_common_structure *structure_field =
BT_FROM_COMMON(field);
BT_LOGD("Freezing structure field object: addr=%p", field);
for (i = 0; i < structure_field->fields->len; i++) {
- struct bt_field_common *field =
+ struct bt_field_common *struct_field =
g_ptr_array_index(structure_field->fields, i);
BT_LOGD("Freezing structure field's field: field-addr=%p, index=%" PRId64,
- field, i);
- bt_field_common_freeze_recursive(field);
+ struct_field, i);
+ bt_field_common_set_is_frozen_recursive(struct_field,
+ is_frozen);
}
- bt_field_common_generic_freeze(field);
+ bt_field_common_generic_set_is_frozen(field, is_frozen);
}
BT_HIDDEN
-void bt_field_common_variant_freeze_recursive(struct bt_field_common *field)
+void bt_field_common_variant_set_is_frozen_recursive(
+ struct bt_field_common *field, bool is_frozen)
{
+ uint64_t i;
struct bt_field_common_variant *variant_field = BT_FROM_COMMON(field);
BT_LOGD("Freezing variant field object: addr=%p", field);
- BT_LOGD("Freezing variant field object's tag field: tag-field-addr=%p", variant_field->tag);
- bt_field_common_freeze_recursive(variant_field->tag);
- BT_LOGD("Freezing variant field object's payload field: payload-field-addr=%p", variant_field->payload);
- bt_field_common_freeze_recursive(variant_field->payload);
- bt_field_common_generic_freeze(field);
+
+ for (i = 0; i < variant_field->fields->len; i++) {
+ struct bt_field_common *var_field =
+ g_ptr_array_index(variant_field->fields, i);
+
+ BT_LOGD("Freezing variant field's field: field-addr=%p, index=%" PRId64,
+ var_field, i);
+ bt_field_common_set_is_frozen_recursive(var_field, is_frozen);
+ }
+
+ bt_field_common_generic_set_is_frozen(field, is_frozen);
}
BT_HIDDEN
-void bt_field_common_array_freeze_recursive(struct bt_field_common *field)
+void bt_field_common_array_set_is_frozen_recursive(
+ struct bt_field_common *field, bool is_frozen)
{
int64_t i;
struct bt_field_common_array *array_field = BT_FROM_COMMON(field);
BT_LOGD("Freezing array field object's element field: "
"element-field-addr=%p, index=%" PRId64,
elem_field, i);
- bt_field_common_freeze_recursive(elem_field);
+ bt_field_common_set_is_frozen_recursive(elem_field, is_frozen);
}
- bt_field_common_generic_freeze(field);
+ bt_field_common_generic_set_is_frozen(field, is_frozen);
}
BT_HIDDEN
-void bt_field_common_sequence_freeze_recursive(struct bt_field_common *field)
+void bt_field_common_sequence_set_is_frozen_recursive(
+ struct bt_field_common *field, bool is_frozen)
{
int64_t i;
struct bt_field_common_sequence *sequence_field =
BT_FROM_COMMON(field);
BT_LOGD("Freezing sequence field object: addr=%p", field);
- BT_LOGD("Freezing sequence field object's length field: length-field-addr=%p",
- sequence_field->length);
- bt_field_common_freeze_recursive(sequence_field->length);
- for (i = 0; i < sequence_field->elements->len; i++) {
+ for (i = 0; i < sequence_field->length; i++) {
struct bt_field_common *elem_field =
g_ptr_array_index(sequence_field->elements, i);
BT_LOGD("Freezing sequence field object's element field: "
"element-field-addr=%p, index=%" PRId64,
elem_field, i);
- bt_field_common_freeze_recursive(elem_field);
+ bt_field_common_set_is_frozen_recursive(elem_field, is_frozen);
}
- bt_field_common_generic_freeze(field);
+ bt_field_common_generic_set_is_frozen(field, is_frozen);
}
BT_HIDDEN
-void _bt_field_common_freeze_recursive(struct bt_field_common *field)
+void _bt_field_common_set_is_frozen_recursive(struct bt_field_common *field,
+ bool is_frozen)
{
if (!field) {
goto end;
goto end;
}
- BT_LOGD("Freezing field object: addr=%p", field);
+ BT_LOGD("Setting field object's frozen state: addr=%p, is-frozen=%d",
+ field, is_frozen);
BT_ASSERT(field_type_common_has_known_id(field->type));
- BT_ASSERT(field->methods->freeze);
- field->methods->freeze(field);
+ BT_ASSERT(field->methods->set_is_frozen);
+ field->methods->set_is_frozen(field, is_frozen);
end:
return;
return field && field->payload_set;
}
-BT_HIDDEN
-bt_bool bt_field_common_enumeration_is_set_recursive(
- struct bt_field_common *field)
-{
- bt_bool is_set = BT_FALSE;
- struct bt_field_common_enumeration *enumeration = BT_FROM_COMMON(field);
-
- BT_ASSERT(field);
-
- if (!enumeration->payload) {
- goto end;
- }
-
- is_set = bt_field_common_is_set_recursive(enumeration->payload);
-
-end:
- return is_set;
-}
-
BT_HIDDEN
bt_bool bt_field_common_structure_is_set_recursive(
struct bt_field_common *field)
bt_bool bt_field_common_variant_is_set_recursive(struct bt_field_common *field)
{
struct bt_field_common_variant *variant = BT_FROM_COMMON(field);
+ bt_bool is_set = BT_FALSE;
BT_ASSERT(field);
- return bt_field_common_is_set_recursive(variant->payload);
+
+ if (variant->current_field) {
+ is_set = bt_field_common_is_set_recursive(
+ variant->current_field);
+ }
+
+ return is_set;
}
BT_HIDDEN
projects / babeltrace.git / blobdiff