#include <babeltrace/ctf-writer/event-types.h>
#include <babeltrace/ctf-ir/event-types-internal.h>
#include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ref.h>
#include <babeltrace/ctf-ir/clock.h>
#include <babeltrace/ctf-writer/writer-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/ref.h>
#include <babeltrace/compiler.h>
#include <babeltrace/endian.h>
#include <float.h>
};
static
-void bt_ctf_field_type_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_destroy(struct bt_object *);
static
-void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *);
static
-void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *);
static
-void (* const type_destroy_funcs[])(struct bt_ctf_ref *) = {
+void (* const type_destroy_funcs[])(struct bt_ctf_field_type *) = {
[CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_destroy,
[CTF_TYPE_ENUM] =
bt_ctf_field_type_enumeration_destroy,
static
void destroy_structure_field(struct structure_field *field)
{
- if (field->type) {
- bt_ctf_field_type_put(field->type);
- }
-
+ bt_put(field->type);
g_free(field);
}
}
static
-void bt_ctf_field_type_init(struct bt_ctf_field_type *type)
+void bt_ctf_field_type_init(struct bt_ctf_field_type *type, int init_bo)
{
enum ctf_type_id type_id = type->declaration->id;
- int ret;
assert(type && (type_id > CTF_TYPE_UNKNOWN) &&
(type_id < NR_CTF_TYPES));
- bt_ctf_ref_init(&type->ref_count);
+ bt_object_init(type, bt_ctf_field_type_destroy);
type->freeze = type_freeze_funcs[type_id];
type->serialize = type_serialize_funcs[type_id];
- ret = bt_ctf_field_type_set_byte_order(type, BT_CTF_BYTE_ORDER_NATIVE);
- assert(!ret);
+
+ if (init_bo) {
+ int ret = bt_ctf_field_type_set_byte_order(type,
+ BT_CTF_BYTE_ORDER_NATIVE);
+ assert(!ret);
+ }
+
type->declaration->alignment = 1;
}
goto end;
}
- bt_ctf_field_type_get(field_type);
+ bt_get(field_type);
field->name = name_quark;
field->type = field_type;
g_hash_table_insert(field_name_to_index,
}
static
-void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_destroy(struct bt_object *obj)
{
struct bt_ctf_field_type *type;
enum ctf_type_id type_id;
- if (!ref) {
- return;
- }
-
- type = container_of(ref, struct bt_ctf_field_type, ref_count);
+ type = container_of(obj, struct bt_ctf_field_type, base);
type_id = type->declaration->id;
if (type_id <= CTF_TYPE_UNKNOWN ||
type_id >= NR_CTF_TYPES) {
return;
}
- type_destroy_funcs[type_id](ref);
+ type_destroy_funcs[type_id](type);
}
BT_HIDDEN
integer->declaration.len = size;
integer->declaration.base = BT_CTF_INTEGER_BASE_DECIMAL;
integer->declaration.encoding = CTF_STRING_NONE;
- bt_ctf_field_type_init(&integer->parent);
+ bt_ctf_field_type_init(&integer->parent, TRUE);
return &integer->parent;
}
integer = container_of(type, struct bt_ctf_field_type_integer, parent);
clock = integer->mapped_clock;
- if (clock) {
- bt_ctf_clock_get(clock);
- }
+ bt_get(clock);
end:
return clock;
}
}
integer = container_of(type, struct bt_ctf_field_type_integer, parent);
- if (integer->mapped_clock) {
- bt_ctf_clock_put(integer->mapped_clock);
- }
-
- if (clock) {
- bt_ctf_clock_get(clock);
- }
-
+ bt_put(integer->mapped_clock);
+ bt_get(clock);
integer->mapped_clock = clock;
end:
return ret;
enumeration->parent.declaration = &enumeration->declaration.p;
enumeration->parent.declaration->id = CTF_TYPE_ENUM;
- bt_ctf_field_type_get(integer_container_type);
+ bt_get(integer_container_type);
enumeration->container = integer_container_type;
enumeration->entries = g_ptr_array_new_with_free_func(
(GDestroyNotify)destroy_enumeration_mapping);
- bt_ctf_field_type_init(&enumeration->parent);
+ bt_ctf_field_type_init(&enumeration->parent, FALSE);
return &enumeration->parent;
error:
g_free(enumeration);
enumeration_type = container_of(type,
struct bt_ctf_field_type_enumeration, parent);
container_type = enumeration_type->container;
- bt_ctf_field_type_get(container_type);
+ bt_get(container_type);
end:
return container_type;
}
floating_point->mantissa.p.alignment = 1;
floating_point->exp.p.alignment = 1;
- bt_ctf_field_type_init(&floating_point->parent);
+ bt_ctf_field_type_init(&floating_point->parent, TRUE);
end:
return floating_point ? &floating_point->parent : NULL;
}
structure->fields = g_ptr_array_new_with_free_func(
(GDestroyNotify)destroy_structure_field);
structure->field_name_to_index = g_hash_table_new(NULL, NULL);
- bt_ctf_field_type_init(&structure->parent);
+ bt_ctf_field_type_init(&structure->parent, TRUE);
return &structure->parent;
error:
return NULL;
ret = -1;
goto end;
}
-
- if (type->declaration->alignment < field_type->declaration->alignment) {
- type->declaration->alignment =
- field_type->declaration->alignment;
- }
end:
return ret;
}
struct structure_field *field;
int ret = 0;
- if (!type || index < 0 || !field_name || !field_type ||
- (type->declaration->id != CTF_TYPE_STRUCT)) {
+ if (!type || index < 0 || (type->declaration->id != CTF_TYPE_STRUCT)) {
ret = -1;
goto end;
}
}
field = g_ptr_array_index(structure->fields, index);
- *field_type = field->type;
- bt_ctf_field_type_get(field->type);
- *field_name = g_quark_to_string(field->name);
+ if (field_type) {
+ *field_type = field->type;
+ bt_get(field->type);
+ }
+ if (field_name) {
+ *field_name = g_quark_to_string(field->name);
+ }
end:
return ret;
}
field = structure->fields->pdata[index];
field_type = field->type;
- bt_ctf_field_type_get(field_type);
+ bt_get(field_type);
end:
return field_type;
}
variant->tag_name = g_string_new(tag_name);
variant->field_name_to_index = g_hash_table_new(NULL, NULL);
variant->fields = g_ptr_array_new_with_free_func(
- (GDestroyNotify)destroy_structure_field);
+ (GDestroyNotify) destroy_structure_field);
if (enum_tag) {
- bt_ctf_field_type_get(enum_tag);
+ bt_get(enum_tag);
variant->tag = container_of(enum_tag,
struct bt_ctf_field_type_enumeration, parent);
}
- bt_ctf_field_type_init(&variant->parent);
+ bt_ctf_field_type_init(&variant->parent, TRUE);
+ /* A variant's alignment is undefined */
+ variant->parent.declaration->alignment = 0;
return &variant->parent;
error:
return NULL;
}
tag_type = &variant->tag->parent;
- bt_ctf_field_type_get(tag_type);
+ bt_get(tag_type);
end:
return tag_type;
}
field = g_ptr_array_index(variant->fields, index);
field_type = field->type;
- bt_ctf_field_type_get(field_type);
+ bt_get(field_type);
end:
return field_type;
}
struct structure_field *field;
int ret = 0;
- if (!type || index < 0 || !field_name || !field_type ||
- (type->declaration->id != CTF_TYPE_VARIANT)) {
+ if (!type || index < 0 || (type->declaration->id != CTF_TYPE_VARIANT)) {
ret = -1;
goto end;
}
}
field = g_ptr_array_index(variant->fields, index);
- *field_type = field->type;
- bt_ctf_field_type_get(field->type);
- *field_name = g_quark_to_string(field->name);
+ if (field_type) {
+ *field_type = field->type;
+ bt_get(field->type);
+ }
+ if (field_name) {
+ *field_name = g_quark_to_string(field->name);
+ }
end:
return ret;
}
array->parent.declaration = &array->declaration.p;
array->parent.declaration->id = CTF_TYPE_ARRAY;
- bt_ctf_field_type_get(element_type);
+ bt_get(element_type);
array->element_type = element_type;
array->length = length;
- bt_ctf_field_type_init(&array->parent);
- array->parent.declaration->alignment =
- element_type->declaration->alignment;
+ bt_ctf_field_type_init(&array->parent, FALSE);
return &array->parent;
error:
return NULL;
array = container_of(type, struct bt_ctf_field_type_array, parent);
ret = array->element_type;
- bt_ctf_field_type_get(ret);
+ bt_get(ret);
end:
return ret;
}
sequence->parent.declaration = &sequence->declaration.p;
sequence->parent.declaration->id = CTF_TYPE_SEQUENCE;
- bt_ctf_field_type_get(element_type);
+ bt_get(element_type);
sequence->element_type = element_type;
sequence->length_field_name = g_string_new(length_field_name);
- bt_ctf_field_type_init(&sequence->parent);
- sequence->parent.declaration->alignment =
- element_type->declaration->alignment;
+ bt_ctf_field_type_init(&sequence->parent, FALSE);
return &sequence->parent;
error:
return NULL;
sequence = container_of(type, struct bt_ctf_field_type_sequence,
parent);
ret = sequence->element_type;
- bt_ctf_field_type_get(ret);
+ bt_get(ret);
end:
return ret;
}
string->parent.declaration = &string->declaration.p;
string->parent.declaration->id = CTF_TYPE_STRING;
- bt_ctf_field_type_init(&string->parent);
+ bt_ctf_field_type_init(&string->parent, TRUE);
string->declaration.encoding = CTF_STRING_UTF8;
string->parent.declaration->alignment = CHAR_BIT;
return &string->parent;
int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
{
int ret;
+ enum ctf_type_id type_id;
if (!type) {
ret = -1;
goto end;
}
- ret = (int) type->declaration->alignment;
+ if (type->frozen) {
+ ret = (int) type->declaration->alignment;
+ goto end;
+ }
+
+ type_id = bt_ctf_field_type_get_type_id(type);
+ switch (type_id) {
+ case CTF_TYPE_SEQUENCE:
+ {
+ struct bt_ctf_field_type *element =
+ bt_ctf_field_type_sequence_get_element_type(type);
+
+ if (!element) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_ctf_field_type_get_alignment(element);
+ bt_put(element);
+ break;
+ }
+ case CTF_TYPE_ARRAY:
+ {
+ struct bt_ctf_field_type *element =
+ bt_ctf_field_type_array_get_element_type(type);
+
+ if (!element) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_ctf_field_type_get_alignment(element);
+ bt_put(element);
+ break;
+ }
+ case CTF_TYPE_STRUCT:
+ {
+ int i, element_count;
+
+ element_count = bt_ctf_field_type_structure_get_field_count(
+ type);
+ if (element_count < 0) {
+ ret = element_count;
+ goto end;
+ }
+
+ for (i = 0; i < element_count; i++) {
+ struct bt_ctf_field_type *field;
+ int field_alignment;
+
+ ret = bt_ctf_field_type_structure_get_field(type, NULL,
+ &field, i);
+ if (ret) {
+ goto end;
+ }
+
+ assert(field);
+ field_alignment = bt_ctf_field_type_get_alignment(
+ field);
+ bt_put(field);
+ if (field_alignment < 0) {
+ ret = field_alignment;
+ goto end;
+ }
+
+ type->declaration->alignment = MAX(field_alignment,
+ type->declaration->alignment);
+ }
+ ret = (int) type->declaration->alignment;
+ break;
+ }
+ case CTF_TYPE_UNKNOWN:
+ ret = -1;
+ break;
+ default:
+ ret = (int) type->declaration->alignment;
+ break;
+ }
end:
return ret;
}
+static inline
+int is_power_of_two(unsigned int value)
+{
+ return ((value & (value - 1)) == 0) && value > 0;
+}
+
int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
unsigned int alignment)
{
int ret = 0;
+ enum ctf_type_id type_id;
- /* Alignment must be bit-aligned (1) or byte aligned */
- if (!type || type->frozen || (alignment != 1 && (alignment & 0x7))) {
+ /* Alignment must be a power of two */
+ if (!type || type->frozen || !is_power_of_two(alignment)) {
+ ret = -1;
+ goto end;
+ }
+
+ type_id = bt_ctf_field_type_get_type_id(type);
+ if (type_id == CTF_TYPE_UNKNOWN) {
ret = -1;
goto end;
}
goto end;
}
+ if (type_id == CTF_TYPE_VARIANT || type_id == CTF_TYPE_SEQUENCE ||
+ type_id == CTF_TYPE_ARRAY) {
+ /* Setting an alignment on these types makes no sense */
+ ret = -1;
+ goto end;
+ }
+
type->declaration->alignment = alignment;
ret = 0;
end:
void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
{
- if (!type) {
- return;
- }
-
- bt_ctf_ref_get(&type->ref_count);
+ bt_get(type);
}
void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
{
- if (!type) {
- return;
- }
-
- bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy);
+ bt_put(type);
}
BT_HIDDEN
return copy;
}
+BT_HIDDEN
+struct bt_ctf_field_path *bt_ctf_field_path_create(void)
+{
+ struct bt_ctf_field_path *field_path = NULL;
+
+ field_path = g_new0(struct bt_ctf_field_path, 1);
+ if (!field_path) {
+ goto end;
+ }
+
+ field_path->root = CTF_NODE_UNKNOWN;
+ field_path->path_indexes = g_array_new(TRUE, FALSE, sizeof(int));
+ if (!field_path->path_indexes) {
+ bt_ctf_field_path_destroy(field_path);
+ field_path = NULL;
+ }
+end:
+ return field_path;
+}
+
+
+BT_HIDDEN
+struct bt_ctf_field_path *bt_ctf_field_path_copy(
+ struct bt_ctf_field_path *path)
+{
+ struct bt_ctf_field_path *new_path = bt_ctf_field_path_create();
+
+ if (!new_path) {
+ goto end;
+ }
+
+ new_path->root = path->root;
+ g_array_insert_vals(new_path->path_indexes, 0,
+ path->path_indexes->data, path->path_indexes->len);
+end:
+ return new_path;
+}
+
+BT_HIDDEN
+void bt_ctf_field_path_destroy(struct bt_ctf_field_path *path)
+{
+ if (!path) {
+ return;
+ }
+
+ if (path->path_indexes) {
+ g_array_free(path->path_indexes, TRUE);
+ }
+ g_free(path);
+}
BT_HIDDEN
int bt_ctf_field_type_structure_get_field_name_index(
end:
return ret;
}
+
+BT_HIDDEN
+int bt_ctf_field_type_structure_set_field_index(struct bt_ctf_field_type *type,
+ struct bt_ctf_field_type *field, int index)
+{
+ int ret = 0;
+ struct bt_ctf_field_type_structure *structure;
+
+ if (!type || !field ||
+ bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) {
+ ret = -1;
+ goto end;
+ }
+
+ structure = container_of(type, struct bt_ctf_field_type_structure,
+ parent);
+ if (index < 0 || index >= structure->fields->len) {
+ ret = -1;
+ goto end;
+ }
+
+ bt_get(field);
+ bt_put(((struct structure_field *)
+ g_ptr_array_index(structure->fields, index))->type);
+ ((struct structure_field *) structure->fields->pdata[index])->type =
+ field;
+end:
+ return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_variant_get_field_name_index(
+ struct bt_ctf_field_type *type, const char *name)
+{
+ int ret;
+ size_t index;
+ GQuark name_quark;
+ struct bt_ctf_field_type_variant *variant;
+
+ if (!type || !name ||
+ bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+ ret = -1;
+ goto end;
+ }
+
+ name_quark = g_quark_try_string(name);
+ if (!name_quark) {
+ 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)) {
+ ret = -1;
+ goto end;
+ }
+ ret = (int) index;
+end:
+ return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_sequence_set_length_field_path(
+ struct bt_ctf_field_type *type,
+ struct bt_ctf_field_path *path)
+{
+ int ret = 0;
+ struct bt_ctf_field_type_sequence *sequence;
+
+ if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_SEQUENCE) {
+ ret = -1;
+ goto end;
+ }
+
+ sequence = container_of(type, struct bt_ctf_field_type_sequence,
+ parent);
+ if (sequence->length_field_path) {
+ bt_ctf_field_path_destroy(sequence->length_field_path);
+ }
+ sequence->length_field_path = path;
+end:
+ return ret;
+}
+
+BT_HIDDEN
+struct bt_ctf_field_path *bt_ctf_field_type_sequence_get_length_field_path(
+ struct bt_ctf_field_type *type)
+{
+ struct bt_ctf_field_type_sequence *sequence;
+
+ sequence = container_of(type, struct bt_ctf_field_type_sequence,
+ parent);
+
+ return sequence->length_field_path;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_tag_field_path(struct bt_ctf_field_type *type,
+ struct bt_ctf_field_path *path)
+{
+ int ret = 0;
+ struct bt_ctf_field_type_variant *variant;
+
+ if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+ ret = -1;
+ goto end;
+ }
+
+ variant = container_of(type, struct bt_ctf_field_type_variant,
+ parent);
+ if (variant->tag_path) {
+ bt_ctf_field_path_destroy(variant->tag_path);
+ }
+ variant->tag_path = path;
+end:
+ return ret;
+}
+
+BT_HIDDEN
+struct bt_ctf_field_path *bt_ctf_field_type_variant_get_tag_field_path(
+ struct bt_ctf_field_type *type)
+{
+ struct bt_ctf_field_type_variant *variant;
+
+ variant = container_of(type, struct bt_ctf_field_type_variant,
+ parent);
+
+ return variant->tag_path;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_tag(struct bt_ctf_field_type *type,
+ struct bt_ctf_field_type *tag)
+{
+ int ret = 0;
+ struct bt_ctf_field_type_variant *variant;
+
+ if (!type || !tag || type->frozen ||
+ bt_ctf_field_type_get_type_id(tag) != CTF_TYPE_ENUM) {
+ ret = -1;
+ goto end;
+ }
+
+ variant = container_of(type, struct bt_ctf_field_type_variant,
+ parent);
+ bt_get(tag);
+ if (variant->tag) {
+ bt_put(&variant->tag->parent);
+ }
+ variant->tag = container_of(tag, struct bt_ctf_field_type_enumeration,
+ parent);
+end:
+ return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_field_index(struct bt_ctf_field_type *type,
+ struct bt_ctf_field_type *field, int index)
+{
+ int ret = 0;
+ struct bt_ctf_field_type_variant *variant;
+
+ if (!type || !field ||
+ bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+ ret = -1;
+ goto end;
+ }
+
+ variant = container_of(type, struct bt_ctf_field_type_variant,
+ parent);
+ if (index < 0 || index >= variant->fields->len) {
+ ret = -1;
+ goto end;
+ }
+
+ bt_get(field);
+ bt_put(((struct structure_field *)
+ g_ptr_array_index(variant->fields, index))->type);
+ ((struct structure_field *) variant->fields->pdata[index])->type =
+ field;
+end:
+ return ret;
+}
+
static
-void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_integer *integer;
+ struct bt_ctf_field_type_integer *integer =
+ (struct bt_ctf_field_type_integer *) type;
- if (!ref) {
+ if (!type) {
return;
}
- integer = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_integer, parent);
- if (integer->mapped_clock) {
- bt_ctf_clock_put(integer->mapped_clock);
- }
+ bt_put(integer->mapped_clock);
g_free(integer);
}
static
-void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_enumeration *enumeration;
+ struct bt_ctf_field_type_enumeration *enumeration =
+ (struct bt_ctf_field_type_enumeration *) type;
- if (!ref) {
+ if (!type) {
return;
}
- enumeration = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_enumeration, parent);
g_ptr_array_free(enumeration->entries, TRUE);
- bt_ctf_field_type_put(enumeration->container);
+ bt_put(enumeration->container);
g_free(enumeration);
}
static
-void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_floating_point *floating_point;
+ struct bt_ctf_field_type_floating_point *floating_point =
+ (struct bt_ctf_field_type_floating_point *) type;
- if (!ref) {
+ if (!type) {
return;
}
- floating_point = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_floating_point, parent);
g_free(floating_point);
}
static
-void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_structure *structure;
+ struct bt_ctf_field_type_structure *structure =
+ (struct bt_ctf_field_type_structure *) type;
- if (!ref) {
+ if (!type) {
return;
}
- structure = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_structure, parent);
g_ptr_array_free(structure->fields, TRUE);
g_hash_table_destroy(structure->field_name_to_index);
g_free(structure);
}
static
-void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_variant *variant;
+ struct bt_ctf_field_type_variant *variant =
+ (struct bt_ctf_field_type_variant *) type;
- if (!ref) {
+ if (!type) {
return;
}
- variant = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_variant, parent);
g_ptr_array_free(variant->fields, TRUE);
g_hash_table_destroy(variant->field_name_to_index);
g_string_free(variant->tag_name, TRUE);
- bt_ctf_field_type_put(&variant->tag->parent);
+ bt_put(&variant->tag->parent);
+ bt_ctf_field_path_destroy(variant->tag_path);
g_free(variant);
}
static
-void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_array *array;
+ struct bt_ctf_field_type_array *array =
+ (struct bt_ctf_field_type_array *) type;
- if (!ref) {
+ if (!type) {
return;
}
- array = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_array, parent);
- bt_ctf_field_type_put(array->element_type);
+ bt_put(array->element_type);
g_free(array);
}
static
-void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_sequence *sequence;
+ struct bt_ctf_field_type_sequence *sequence =
+ (struct bt_ctf_field_type_sequence *) type;
- if (!ref) {
+ if (!type) {
return;
}
- sequence = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_sequence, parent);
- bt_ctf_field_type_put(sequence->element_type);
+ bt_put(sequence->element_type);
g_string_free(sequence->length_field_name, TRUE);
+ bt_ctf_field_path_destroy(sequence->length_field_path);
g_free(sequence);
}
static
-void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *type)
{
- struct bt_ctf_field_type_string *string;
+ struct bt_ctf_field_type_string *string =
+ (struct bt_ctf_field_type_string *) type;
- if (!ref) {
+ if (!type) {
return;
}
- string = container_of(
- container_of(ref, struct bt_ctf_field_type, ref_count),
- struct bt_ctf_field_type_string, parent);
g_free(string);
}
struct bt_ctf_field_type_structure *structure_type = container_of(
type, struct bt_ctf_field_type_structure, parent);
+ /* Cache the alignment */
+ type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
generic_field_type_freeze(type);
- g_ptr_array_foreach(structure_type->fields, (GFunc)freeze_structure_field,
- NULL);
+ g_ptr_array_foreach(structure_type->fields,
+ (GFunc) freeze_structure_field, NULL);
}
static
struct bt_ctf_field_type_variant *variant_type = container_of(
type, struct bt_ctf_field_type_variant, parent);
+ /* Cache the alignment */
+ type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
generic_field_type_freeze(type);
- g_ptr_array_foreach(variant_type->fields, (GFunc)freeze_structure_field,
- NULL);
+ g_ptr_array_foreach(variant_type->fields,
+ (GFunc) freeze_structure_field, NULL);
}
static
struct bt_ctf_field_type_array *array_type = container_of(
type, struct bt_ctf_field_type_array, parent);
+ /* Cache the alignment */
+ type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
generic_field_type_freeze(type);
bt_ctf_field_type_freeze(array_type->element_type);
}
struct bt_ctf_field_type_sequence *sequence_type = container_of(
type, struct bt_ctf_field_type_sequence, parent);
+ /* Cache the alignment */
+ type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
generic_field_type_freeze(type);
bt_ctf_field_type_freeze(sequence_type->element_type);
}
g_string_assign(context->field_name, "");
}
error_put_container_type:
- bt_ctf_field_type_put(container_type);
+ bt_put(container_type);
end:
return ret;
}
parent);
copy_integer->declaration = integer->declaration;
if (integer->mapped_clock) {
- bt_ctf_clock_get(integer->mapped_clock);
+ bt_get(integer->mapped_clock);
copy_integer->mapped_clock = integer->mapped_clock;
}
end:
copy_enumeration->declaration = enumeration->declaration;
end:
- if (copy_container) {
- bt_ctf_field_type_put(copy_container);
- }
+ bt_put(copy_container);
return copy;
error:
- if (copy_container) {
- bt_ctf_field_type_put(copy_container);
- }
- bt_ctf_field_type_put(copy);
- return NULL;
+ bt_put(copy_container);
+ BT_PUT(copy);
+ return copy;
}
static
end:
return copy;
error:
- bt_ctf_field_type_put(copy);
- return NULL;
+ BT_PUT(copy);
+ return copy;
}
static
}
copy_variant->declaration = variant->declaration;
-end:
- if (copy_tag) {
- bt_ctf_field_type_put(copy_tag);
+ if (variant->tag_path) {
+ copy_variant->tag_path = bt_ctf_field_path_copy(
+ variant->tag_path);
+ if (!copy_variant->tag_path) {
+ goto error;
+ }
}
-
+end:
+ bt_put(copy_tag);
return copy;
error:
- if (copy_tag) {
- bt_ctf_field_type_put(copy_tag);
- }
-
- bt_ctf_field_type_put(copy);
- return NULL;
+ bt_put(copy_tag);
+ BT_PUT(copy);
+ return copy;
}
static
parent);
copy_array->declaration = array->declaration;
end:
- if (copy_element) {
- bt_ctf_field_type_put(copy_element);
- }
-
+ bt_put(copy_element);
return copy;
}
copy_sequence = container_of(copy, struct bt_ctf_field_type_sequence,
parent);
copy_sequence->declaration = sequence->declaration;
-end:
- if (copy_element) {
- bt_ctf_field_type_put(copy_element);
+ if (sequence->length_field_path) {
+ copy_sequence->length_field_path = bt_ctf_field_path_copy(
+ sequence->length_field_path);
+ if (!copy_sequence->length_field_path) {
+ goto error;
+ }
}
-
+end:
+ bt_put(copy_element);
return copy;
+error:
+ BT_PUT(copy);
+ goto end;
}
static
projects / babeltrace.git / blobdiff