/*
- * field-classes.c
- *
- * Babeltrace trace IR - Event Types
- *
* Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
#include <babeltrace/lib-logging-internal.h>
#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/private-field-classes.h>
#include <babeltrace/trace-ir/field-classes-internal.h>
#include <babeltrace/trace-ir/field-path-internal.h>
#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/private-fields.h>
#include <babeltrace/trace-ir/fields.h>
#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
#include <babeltrace/trace-ir/clock-class.h>
#include <babeltrace/trace-ir/clock-class-internal.h>
#include <babeltrace/object-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/endian-internal.h>
#include <babeltrace/assert-internal.h>
#include <inttypes.h>
#include <stdlib.h>
-enum bt_field_class_id bt_field_class_get_id(struct bt_field_class *fc)
+enum bt_field_class_type bt_field_class_get_type(struct bt_field_class *fc)
{
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- return fc->id;
+ return fc->type;
}
static
-void init_field_class(struct bt_field_class *fc, enum bt_field_class_id id,
+void init_field_class(struct bt_field_class *fc, enum bt_field_class_type type,
bt_object_release_func release_func)
{
BT_ASSERT(fc);
- BT_ASSERT(bt_field_class_has_known_id(fc));
+ BT_ASSERT(bt_field_class_has_known_type(fc));
BT_ASSERT(release_func);
bt_object_init_shared(&fc->base, release_func);
- fc->id = id;
+ fc->type = type;
}
static
-void init_integer_field_class(struct bt_field_class_integer *fc, enum bt_field_class_id id,
+void init_integer_field_class(struct bt_field_class_integer *fc,
+ enum bt_field_class_type type,
bt_object_release_func release_func)
{
- init_field_class((void *) fc, id, release_func);
+ init_field_class((void *) fc, type, release_func);
fc->range = 64;
fc->base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL;
}
void destroy_integer_field_class(struct bt_object *obj)
{
BT_ASSERT(obj);
- BT_LIB_LOGD("Destroying integer field classe object: %!+F", obj);
+ BT_LIB_LOGD("Destroying integer field class object: %!+F", obj);
g_free(obj);
}
static inline
-struct bt_field_class *create_integer_field_class(enum bt_field_class_id id)
+struct bt_field_class *create_integer_field_class(enum bt_field_class_type type)
{
struct bt_field_class_integer *int_fc = NULL;
- BT_LOGD("Creating default integer field classe object: id=%s",
- bt_common_field_class_id_string(id));
+ BT_LOGD("Creating default integer field class object: type=%s",
+ bt_common_field_class_type_string(type));
int_fc = g_new0(struct bt_field_class_integer, 1);
if (!int_fc) {
- BT_LOGE_STR("Failed to allocate one integer field classe.");
+ BT_LOGE_STR("Failed to allocate one integer field class.");
goto error;
}
- init_integer_field_class(int_fc, id, destroy_integer_field_class);
- BT_LIB_LOGD("Created integer field classe object: %!+F", int_fc);
+ init_integer_field_class(int_fc, type, destroy_integer_field_class);
+ BT_LIB_LOGD("Created integer field class object: %!+F", int_fc);
goto end;
error:
- BT_PUT(int_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(int_fc);
end:
return (void *) int_fc;
}
-struct bt_field_class *bt_field_class_unsigned_integer_create(void)
+struct bt_private_field_class *
+bt_private_field_class_unsigned_integer_create(void)
{
- return create_integer_field_class(BT_FIELD_CLASS_ID_UNSIGNED_INTEGER);
+ return (void *) create_integer_field_class(
+ BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER);
}
-struct bt_field_class *bt_field_class_signed_integer_create(void)
+struct bt_private_field_class *bt_private_field_class_signed_integer_create(void)
{
- return create_integer_field_class(BT_FIELD_CLASS_ID_SIGNED_INTEGER);
+ return (void *) create_integer_field_class(
+ BT_FIELD_CLASS_TYPE_SIGNED_INTEGER);
}
uint64_t bt_field_class_integer_get_field_value_range(
return true;
}
-int bt_field_class_integer_set_field_value_range(
- struct bt_field_class *fc, uint64_t size)
+void bt_private_field_class_integer_set_field_value_range(
+ struct bt_private_field_class *priv_fc, uint64_t size)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_integer *int_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
BT_ASSERT_PRE_FC_HOT(fc, "Field class");
BT_ASSERT_PRE(size <= 64,
- "Unsupported size for integer field classe's field value range "
+ "Unsupported size for integer field class's field value range "
"(maximum is 64): size=%" PRIu64, size);
- BT_ASSERT_PRE(int_fc->common.id == BT_FIELD_CLASS_ID_UNSIGNED_INTEGER ||
- int_fc->common.id == BT_FIELD_CLASS_ID_SIGNED_INTEGER ||
+ BT_ASSERT_PRE(
+ int_fc->common.type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
+ int_fc->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
size_is_valid_for_enumeration_field_class(fc, size),
- "Invalid field value range for enumeration field classe: "
+ "Invalid field value range for enumeration field class: "
"at least one of the current mapping ranges contains values "
"which are outside this range: %!+F, size=%" PRIu64, fc, size);
int_fc->range = size;
- BT_LIB_LOGV("Set integer field classe's field value range: %!+F", fc);
- return 0;
+ BT_LIB_LOGV("Set integer field class's field value range: %!+F", fc);
}
enum bt_field_class_integer_preferred_display_base
return int_fc->base;
}
-int bt_field_class_integer_set_preferred_display_base(struct bt_field_class *fc,
+void bt_private_field_class_integer_set_preferred_display_base(
+ struct bt_private_field_class *priv_fc,
enum bt_field_class_integer_preferred_display_base base)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_integer *int_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
BT_ASSERT_PRE_FC_HOT(fc, "Field class");
int_fc->base = base;
- BT_LIB_LOGV("Set integer field classe's preferred display base: %!+F", fc);
- return 0;
+ BT_LIB_LOGV("Set integer field class's preferred display base: %!+F", fc);
}
static
struct bt_field_class_enumeration *fc = (void *) obj;
BT_ASSERT(fc);
- BT_LIB_LOGD("Destroying enumeration field classe object: %!+F", fc);
+ BT_LIB_LOGD("Destroying enumeration field class object: %!+F", fc);
if (fc->mappings) {
uint64_t i;
}
g_array_free(fc->mappings, TRUE);
+ fc->mappings = NULL;
}
if (fc->label_buf) {
g_ptr_array_free(fc->label_buf, TRUE);
+ fc->label_buf = NULL;
}
g_free(fc);
}
static
-struct bt_field_class *create_enumeration_field_class(enum bt_field_class_id id)
+struct bt_field_class *create_enumeration_field_class(enum bt_field_class_type type)
{
struct bt_field_class_enumeration *enum_fc = NULL;
- BT_LOGD("Creating default enumeration field classe object: id=%s",
- bt_common_field_class_id_string(id));
+ BT_LOGD("Creating default enumeration field class object: type=%s",
+ bt_common_field_class_type_string(type));
enum_fc = g_new0(struct bt_field_class_enumeration, 1);
if (!enum_fc) {
- BT_LOGE_STR("Failed to allocate one enumeration field classe.");
+ BT_LOGE_STR("Failed to allocate one enumeration field class.");
goto error;
}
- init_integer_field_class((void *) enum_fc, id,
+ init_integer_field_class((void *) enum_fc, type,
destroy_enumeration_field_class);
enum_fc->mappings = g_array_new(FALSE, TRUE,
sizeof(struct bt_field_class_enumeration_mapping));
goto error;
}
- BT_LIB_LOGD("Created enumeration field classe object: %!+F", enum_fc);
+ BT_LIB_LOGD("Created enumeration field class object: %!+F", enum_fc);
goto end;
error:
- BT_PUT(enum_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(enum_fc);
end:
return (void *) enum_fc;
}
-struct bt_field_class *bt_field_class_unsigned_enumeration_create(void)
+struct bt_private_field_class *
+bt_private_field_class_unsigned_enumeration_create(void)
{
- return create_enumeration_field_class(
- BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION);
+ return (void *) create_enumeration_field_class(
+ BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION);
}
-struct bt_field_class *bt_field_class_signed_enumeration_create(void)
+struct bt_private_field_class *
+bt_private_field_class_signed_enumeration_create(void)
{
- return create_enumeration_field_class(
- BT_FIELD_CLASS_ID_SIGNED_ENUMERATION);
+ return (void *) create_enumeration_field_class(
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
}
uint64_t bt_field_class_enumeration_get_mapping_count(struct bt_field_class *fc)
BT_ASSERT_PRE_NON_NULL(name, "Name (output)");
BT_ASSERT_PRE_NON_NULL(ranges, "Ranges (output)");
BT_ASSERT_PRE_VALID_INDEX(index, enum_fc->mappings->len);
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
"Field class");
mapping = BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
*name = mapping->label->str;
BT_ASSERT_PRE_NON_NULL(name, "Name (output)");
BT_ASSERT_PRE_NON_NULL(ranges, "Ranges (output)");
BT_ASSERT_PRE_VALID_INDEX(index, enum_fc->mappings->len);
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_SIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
"Field class");
mapping = BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
*name = mapping->label->str;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)");
BT_ASSERT_PRE_NON_NULL(count, "Count (output)");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
"Field class");
g_ptr_array_set_size(enum_fc->label_buf, 0);
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)");
BT_ASSERT_PRE_NON_NULL(count, "Count (output)");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_SIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
"Field class");
g_ptr_array_set_size(enum_fc->label_buf, 0);
mapping->ranges->len - 1);
range->lower.u = lower;
range->upper.u = upper;
- BT_LIB_LOGV("Added mapping to enumeration field classe: "
+ BT_LIB_LOGV("Added mapping to enumeration field class: "
"%![fc-]+F, label=\"%s\", lower-unsigned=%" PRIu64 ", "
"upper-unsigned=%" PRIu64, fc, label, lower, upper);
return ret;
}
-int bt_field_class_unsigned_enumeration_map_range(
- struct bt_field_class *fc, const char *label,
+int bt_private_field_class_unsigned_enumeration_map_range(
+ struct bt_private_field_class *priv_fc, const char *label,
uint64_t range_lower, uint64_t range_upper)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_enumeration *enum_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
"Field class");
BT_ASSERT_PRE(range_lower <= range_upper,
"Range's upper bound is less than lower bound: "
range_lower, range_upper);
BT_ASSERT_PRE(bt_util_value_is_in_range_unsigned(enum_fc->common.range,
range_lower),
- "Range's lower bound is outside the enumeration field classe's value range: "
+ "Range's lower bound is outside the enumeration field class's value range: "
"%![fc-]+F, lower=%" PRIu64, fc, range_lower);
BT_ASSERT_PRE(bt_util_value_is_in_range_unsigned(enum_fc->common.range,
range_upper),
- "Range's upper bound is outside the enumeration field classe's value range: "
+ "Range's upper bound is outside the enumeration field class's value range: "
"%![fc-]+F, upper=%" PRIu64, fc, range_upper);
return add_mapping_to_enumeration_field_class(fc, label, range_lower,
range_upper);
}
-int bt_field_class_signed_enumeration_map_range(
- struct bt_field_class *fc, const char *label,
+int bt_private_field_class_signed_enumeration_map_range(
+ struct bt_private_field_class *priv_fc, const char *label,
int64_t range_lower, int64_t range_upper)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_enumeration *enum_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_SIGNED_ENUMERATION,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
"Field class");
BT_ASSERT_PRE(range_lower <= range_upper,
"Range's upper bound is less than lower bound: "
range_lower, range_upper);
BT_ASSERT_PRE(bt_util_value_is_in_range_signed(enum_fc->common.range,
range_lower),
- "Range's lower bound is outside the enumeration field classe's value range: "
+ "Range's lower bound is outside the enumeration field class's value range: "
"%![fc-]+F, lower=%" PRId64, fc, range_lower);
BT_ASSERT_PRE(bt_util_value_is_in_range_signed(enum_fc->common.range,
range_upper),
- "Range's upper bound is outside the enumeration field classe's value range: "
+ "Range's upper bound is outside the enumeration field class's value range: "
"%![fc-]+F, upper=%" PRId64, fc, range_upper);
return add_mapping_to_enumeration_field_class(fc, label, range_lower,
range_upper);
void destroy_real_field_class(struct bt_object *obj)
{
BT_ASSERT(obj);
- BT_LIB_LOGD("Destroying real field classe object: %!+F", obj);
+ BT_LIB_LOGD("Destroying real field class object: %!+F", obj);
g_free(obj);
}
-struct bt_field_class *bt_field_class_real_create(void)
+struct bt_private_field_class *bt_private_field_class_real_create(void)
{
struct bt_field_class_real *real_fc = NULL;
- BT_LOGD_STR("Creating default real field classe object.");
+ BT_LOGD_STR("Creating default real field class object.");
real_fc = g_new0(struct bt_field_class_real, 1);
if (!real_fc) {
- BT_LOGE_STR("Failed to allocate one real field classe.");
+ BT_LOGE_STR("Failed to allocate one real field class.");
goto error;
}
- init_field_class((void *) real_fc, BT_FIELD_CLASS_ID_REAL,
+ init_field_class((void *) real_fc, BT_FIELD_CLASS_TYPE_REAL,
destroy_real_field_class);
- BT_LIB_LOGD("Created real field classe object: %!+F", real_fc);
+ BT_LIB_LOGD("Created real field class object: %!+F", real_fc);
goto end;
error:
- BT_PUT(real_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(real_fc);
end:
return (void *) real_fc;
struct bt_field_class_real *real_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_REAL, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_REAL, "Field class");
return real_fc->is_single_precision;
}
-int bt_field_class_real_set_is_single_precision(struct bt_field_class *fc,
+void bt_private_field_class_real_set_is_single_precision(
+ struct bt_private_field_class *priv_fc,
bt_bool is_single_precision)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_real *real_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_REAL, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_REAL, "Field class");
BT_ASSERT_PRE_FC_HOT(fc, "Field class");
real_fc->is_single_precision = (bool) is_single_precision;
- BT_LIB_LOGV("Set real field classe's \"is single precision\" property: "
+ BT_LIB_LOGV("Set real field class's \"is single precision\" property: "
"%!+F", fc);
- return 0;
}
static
int init_named_field_classes_container(
struct bt_field_class_named_field_class_container *fc,
- enum bt_field_class_id id, bt_object_release_func release_func)
+ enum bt_field_class_type type, bt_object_release_func release_func)
{
int ret = 0;
- init_field_class((void *) fc, id, release_func);
+ init_field_class((void *) fc, type, release_func);
fc->named_fcs = g_array_new(FALSE, TRUE,
sizeof(struct bt_named_field_class));
if (!fc->named_fcs) {
void finalize_named_field_class(struct bt_named_field_class *named_fc)
{
BT_ASSERT(named_fc);
- BT_LIB_LOGD("Finalizing named field classe: "
+ BT_LIB_LOGD("Finalizing named field class: "
"addr=%p, name=\"%s\", %![fc-]+F",
named_fc, named_fc->name ? named_fc->name->str : NULL,
named_fc->fc);
g_string_free(named_fc->name, TRUE);
}
- BT_LOGD_STR("Putting named field classe's field classe.");
- bt_put(named_fc->fc);
+ BT_LOGD_STR("Putting named field class's field class.");
+ BT_OBJECT_PUT_REF_AND_RESET(named_fc->fc);
}
static
void destroy_structure_field_class(struct bt_object *obj)
{
BT_ASSERT(obj);
- BT_LIB_LOGD("Destroying string field classe object: %!+F", obj);
+ BT_LIB_LOGD("Destroying string field class object: %!+F", obj);
finalize_named_field_classes_container((void *) obj);
g_free(obj);
}
-struct bt_field_class *bt_field_class_structure_create(void)
+struct bt_private_field_class *bt_private_field_class_structure_create(void)
{
int ret;
struct bt_field_class_structure *struct_fc = NULL;
- BT_LOGD_STR("Creating default structure field classe object.");
+ BT_LOGD_STR("Creating default structure field class object.");
struct_fc = g_new0(struct bt_field_class_structure, 1);
if (!struct_fc) {
- BT_LOGE_STR("Failed to allocate one structure field classe.");
+ BT_LOGE_STR("Failed to allocate one structure field class.");
goto error;
}
ret = init_named_field_classes_container((void *) struct_fc,
- BT_FIELD_CLASS_ID_STRUCTURE, destroy_structure_field_class);
+ BT_FIELD_CLASS_TYPE_STRUCTURE, destroy_structure_field_class);
if (ret) {
goto error;
}
- BT_LIB_LOGD("Created structure field classe object: %!+F", struct_fc);
+ BT_LIB_LOGD("Created structure field class object: %!+F", struct_fc);
goto end;
error:
- BT_PUT(struct_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(struct_fc);
end:
return (void *) struct_fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
BT_ASSERT_PRE(!bt_g_hash_table_contains(container_fc->name_to_index,
name),
- "Duplicate member/option name in structure/variant field classe: "
+ "Duplicate member/option name in structure/variant field class: "
"%![container-fc-]+F, name=\"%s\"", container_fc, name);
name_str = g_string_new(name);
if (!name_str) {
named_fc = &g_array_index(container_fc->named_fcs,
struct bt_named_field_class, container_fc->named_fcs->len - 1);
named_fc->name = name_str;
- named_fc->fc = bt_get(fc);
+ named_fc->fc = bt_object_get_ref(fc);
g_hash_table_insert(container_fc->name_to_index, named_fc->name->str,
GUINT_TO_POINTER(container_fc->named_fcs->len - 1));
bt_field_class_freeze(fc);
return ret;
}
-int bt_field_class_structure_append_member(struct bt_field_class *fc,
- const char *name, struct bt_field_class *member_fc)
+int bt_private_field_class_structure_append_member(
+ struct bt_private_field_class *priv_fc,
+ const char *name, struct bt_private_field_class *member_fc)
{
+ struct bt_field_class *fc = (void *) priv_fc;
+
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_STRUCTURE, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, "Field class");
return append_named_field_class_to_container_field_class((void *) fc,
- name, member_fc);
+ name, (void *) member_fc);
}
uint64_t bt_field_class_structure_get_member_count(struct bt_field_class *fc)
struct bt_field_class_structure *struct_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_STRUCTURE, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, "Field class");
return (uint64_t) struct_fc->common.named_fcs->len;
}
const char **name, struct bt_field_class **out_fc)
{
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_STRUCTURE, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, "Field class");
borrow_named_field_class_from_container_field_class_at_index((void *) fc,
index, name, out_fc);
}
+void bt_private_field_class_structure_borrow_member_by_index(
+ struct bt_private_field_class *fc, uint64_t index,
+ const char **name, struct bt_private_field_class **out_fc)
+{
+ bt_field_class_structure_borrow_member_by_index((void *) fc,
+ index, name, (void *) out_fc);
+}
+
static
struct bt_field_class *borrow_field_class_from_container_field_class_by_name(
struct bt_field_class_named_field_class_container *fc,
struct bt_field_class *fc, const char *name)
{
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_STRUCTURE, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, "Field class");
return borrow_field_class_from_container_field_class_by_name((void *) fc,
name);
}
+struct bt_private_field_class *
+bt_private_field_class_structure_borrow_member_field_class_by_name(
+ struct bt_private_field_class *fc, const char *name)
+{
+ return (void *) bt_field_class_structure_borrow_member_field_class_by_name(
+ (void *) fc, name);
+}
+
static
void destroy_variant_field_class(struct bt_object *obj)
{
struct bt_field_class_variant *fc = (void *) obj;
BT_ASSERT(fc);
- BT_LIB_LOGD("Destroying variant field classe object: %!+F", fc);
+ BT_LIB_LOGD("Destroying variant field class object: %!+F", fc);
finalize_named_field_classes_container((void *) fc);
BT_LOGD_STR("Putting selector field path.");
- bt_put(fc->selector_field_path);
+ BT_OBJECT_PUT_REF_AND_RESET(fc->selector_field_path);
+ BT_LOGD_STR("Putting selector field class.");
+ BT_OBJECT_PUT_REF_AND_RESET(fc->selector_fc);
g_free(fc);
}
-struct bt_field_class *bt_field_class_variant_create(void)
+struct bt_private_field_class *bt_private_field_class_variant_create(void)
{
int ret;
struct bt_field_class_variant *var_fc = NULL;
- BT_LOGD_STR("Creating default variant field classe object.");
+ BT_LOGD_STR("Creating default variant field class object.");
var_fc = g_new0(struct bt_field_class_variant, 1);
if (!var_fc) {
- BT_LOGE_STR("Failed to allocate one variant field classe.");
+ BT_LOGE_STR("Failed to allocate one variant field class.");
goto error;
}
ret = init_named_field_classes_container((void *) var_fc,
- BT_FIELD_CLASS_ID_VARIANT, destroy_variant_field_class);
+ BT_FIELD_CLASS_TYPE_VARIANT, destroy_variant_field_class);
if (ret) {
goto error;
}
- BT_LIB_LOGD("Created variant field classe object: %!+F", var_fc);
+ BT_LIB_LOGD("Created variant field class object: %!+F", var_fc);
goto end;
error:
- BT_PUT(var_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(var_fc);
end:
return (void *) var_fc;
}
-int bt_field_class_variant_set_selector_field_class(
- struct bt_field_class *fc, struct bt_field_class *selector_fc)
+int bt_private_field_class_variant_set_selector_field_class(
+ struct bt_private_field_class *priv_fc,
+ struct bt_private_field_class *selector_fc)
{
+ struct bt_field_class *fc = (void *) priv_fc;
struct bt_field_class_variant *var_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Variant field classe");
- BT_ASSERT_PRE_NON_NULL(selector_fc, "Selector field classe");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT, "Field class");
- BT_ASSERT_PRE_FC_IS_ENUM(selector_fc, "Selector field classe");
- BT_ASSERT_PRE_FC_HOT(fc, "Variant field classe");
- var_fc->selector_fc = selector_fc;
- bt_field_class_freeze(selector_fc);
+ BT_ASSERT_PRE_NON_NULL(fc, "Variant field class");
+ BT_ASSERT_PRE_NON_NULL(selector_fc, "Selector field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT, "Field class");
+ BT_ASSERT_PRE_FC_IS_ENUM(selector_fc, "Selector field class");
+ BT_ASSERT_PRE_FC_HOT(fc, "Variant field class");
+ var_fc->selector_fc = bt_object_get_ref(selector_fc);
+ bt_field_class_freeze((void *) selector_fc);
return 0;
}
-int bt_field_class_variant_append_option(struct bt_field_class *fc,
- const char *name, struct bt_field_class *option_fc)
+int bt_private_field_class_variant_append_private_option(
+ struct bt_private_field_class *priv_fc,
+ const char *name, struct bt_private_field_class *option_fc)
{
+ struct bt_field_class *fc = (void *) priv_fc;
+
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT, "Field class");
return append_named_field_class_to_container_field_class((void *) fc,
- name, option_fc);
+ name, (void *) option_fc);
}
struct bt_field_class *bt_field_class_variant_borrow_option_field_class_by_name(
struct bt_field_class *fc, const char *name)
{
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT, "Field class");
return borrow_field_class_from_container_field_class_by_name((void *) fc,
name);
}
+struct bt_private_field_class *
+bt_private_field_class_variant_borrow_option_field_class_by_name(
+ struct bt_private_field_class *fc, const char *name)
+{
+ return (void *) bt_field_class_variant_borrow_option_field_class_by_name(
+ (void *) fc, name);
+}
+
uint64_t bt_field_class_variant_get_option_count(struct bt_field_class *fc)
{
struct bt_field_class_variant *var_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT, "Field class");
return (uint64_t) var_fc->common.named_fcs->len;
}
const char **name, struct bt_field_class **out_fc)
{
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT, "Field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT, "Field class");
borrow_named_field_class_from_container_field_class_at_index((void *) fc,
index, name, out_fc);
}
+void bt_private_field_class_variant_borrow_option_by_index(
+ struct bt_private_field_class *fc, uint64_t index,
+ const char **name, struct bt_private_field_class **out_fc)
+{
+ bt_field_class_variant_borrow_option_by_index((void *) fc,
+ index, name, (void *) out_fc);
+}
+
struct bt_field_path *bt_field_class_variant_borrow_selector_field_path(
struct bt_field_class *fc)
{
struct bt_field_class_variant *var_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_VARIANT,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_VARIANT,
"Field class");
return var_fc->selector_field_path;
}
static
void init_array_field_class(struct bt_field_class_array *fc,
- enum bt_field_class_id id, bt_object_release_func release_func,
+ enum bt_field_class_type type, bt_object_release_func release_func,
struct bt_field_class *element_fc)
{
BT_ASSERT(element_fc);
- init_field_class((void *) fc, id, release_func);
- fc->element_fc = bt_get(element_fc);
+ init_field_class((void *) fc, type, release_func);
+ fc->element_fc = bt_object_get_ref(element_fc);
bt_field_class_freeze(element_fc);
}
void finalize_array_field_class(struct bt_field_class_array *array_fc)
{
BT_ASSERT(array_fc);
- BT_LOGD_STR("Putting element field classe.");
- bt_put(array_fc->element_fc);
+ BT_LOGD_STR("Putting element field class.");
+ BT_OBJECT_PUT_REF_AND_RESET(array_fc->element_fc);
}
static
void destroy_static_array_field_class(struct bt_object *obj)
{
BT_ASSERT(obj);
- BT_LIB_LOGD("Destroying static array field classe object: %!+F", obj);
+ BT_LIB_LOGD("Destroying static array field class object: %!+F", obj);
finalize_array_field_class((void *) obj);
g_free(obj);
}
-struct bt_field_class *bt_field_class_static_array_create(
- struct bt_field_class *element_fc, uint64_t length)
+struct bt_private_field_class *
+bt_private_field_class_static_array_create(
+ struct bt_private_field_class *priv_element_fc,
+ uint64_t length)
{
+ struct bt_field_class *element_fc = (void *) priv_element_fc;
struct bt_field_class_static_array *array_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(element_fc, "Element field classe");
- BT_LOGD_STR("Creating default static array field classe object.");
+ BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
+ BT_LOGD_STR("Creating default static array field class object.");
array_fc = g_new0(struct bt_field_class_static_array, 1);
if (!array_fc) {
- BT_LOGE_STR("Failed to allocate one static array field classe.");
+ BT_LOGE_STR("Failed to allocate one static array field class.");
goto error;
}
- init_array_field_class((void *) array_fc, BT_FIELD_CLASS_ID_STATIC_ARRAY,
+ init_array_field_class((void *) array_fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
destroy_static_array_field_class, element_fc);
array_fc->length = length;
- BT_LIB_LOGD("Created static array field classe object: %!+F", array_fc);
+ BT_LIB_LOGD("Created static array field class object: %!+F", array_fc);
goto end;
error:
- BT_PUT(array_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(array_fc);
end:
return (void *) array_fc;
return array_fc->element_fc;
}
+struct bt_private_field_class *
+bt_private_field_class_array_borrow_element_field_class(
+ struct bt_private_field_class *fc)
+{
+ return (void *) bt_field_class_array_borrow_element_field_class(
+ (void *) fc);
+}
+
uint64_t bt_field_class_static_array_get_length(struct bt_field_class *fc)
{
struct bt_field_class_static_array *array_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_STATIC_ARRAY,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
"Field class");
return (uint64_t) array_fc->length;
}
struct bt_field_class_dynamic_array *fc = (void *) obj;
BT_ASSERT(fc);
- BT_LIB_LOGD("Destroying dynamic array field classe object: %!+F", fc);
+ BT_LIB_LOGD("Destroying dynamic array field class object: %!+F", fc);
finalize_array_field_class((void *) fc);
BT_LOGD_STR("Putting length field path.");
- bt_put(fc->length_field_path);
+ BT_OBJECT_PUT_REF_AND_RESET(fc->length_field_path);
+ BT_LOGD_STR("Putting length field class.");
+ BT_OBJECT_PUT_REF_AND_RESET(fc->length_fc);
g_free(fc);
}
-struct bt_field_class *bt_field_class_dynamic_array_create(
- struct bt_field_class *element_fc)
+struct bt_private_field_class *bt_private_field_class_dynamic_array_create(
+ struct bt_private_field_class *priv_element_fc)
{
+ struct bt_field_class *element_fc = (void *) priv_element_fc;
struct bt_field_class_dynamic_array *array_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(element_fc, "Element field classe");
- BT_LOGD_STR("Creating default dynamic array field classe object.");
+ BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
+ BT_LOGD_STR("Creating default dynamic array field class object.");
array_fc = g_new0(struct bt_field_class_dynamic_array, 1);
if (!array_fc) {
- BT_LOGE_STR("Failed to allocate one dynamic array field classe.");
+ BT_LOGE_STR("Failed to allocate one dynamic array field class.");
goto error;
}
- init_array_field_class((void *) array_fc, BT_FIELD_CLASS_ID_DYNAMIC_ARRAY,
+ init_array_field_class((void *) array_fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
destroy_dynamic_array_field_class, element_fc);
- BT_LIB_LOGD("Created dynamic array field classe object: %!+F", array_fc);
+ BT_LIB_LOGD("Created dynamic array field class object: %!+F", array_fc);
goto end;
error:
- BT_PUT(array_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(array_fc);
end:
return (void *) array_fc;
}
-int bt_field_class_dynamic_array_set_length_field_class(struct bt_field_class *fc,
- struct bt_field_class *length_fc)
+int bt_private_field_class_dynamic_array_set_length_field_class(
+ struct bt_private_field_class *priv_fc,
+ struct bt_private_field_class *priv_length_fc)
{
+ struct bt_field_class *fc = (void *) priv_fc;
+ struct bt_field_class *length_fc = (void *) priv_length_fc;
struct bt_field_class_dynamic_array *array_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Dynamic array field classe");
- BT_ASSERT_PRE_NON_NULL(length_fc, "Length field classe");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_DYNAMIC_ARRAY,
+ BT_ASSERT_PRE_NON_NULL(fc, "Dynamic array field class");
+ BT_ASSERT_PRE_NON_NULL(length_fc, "Length field class");
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
"Field class");
- BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc, "Length field classe");
- BT_ASSERT_PRE_FC_HOT(fc, "Dynamic array field classe");
- array_fc->length_fc = length_fc;
+ BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc, "Length field class");
+ BT_ASSERT_PRE_FC_HOT(fc, "Dynamic array field class");
+ array_fc->length_fc = bt_object_get_ref(length_fc);
bt_field_class_freeze(length_fc);
return 0;
}
struct bt_field_class_dynamic_array *seq_fc = (void *) fc;
BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_ID_DYNAMIC_ARRAY,
+ BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
"Field class");
return seq_fc->length_field_path;
}
void destroy_string_field_class(struct bt_object *obj)
{
BT_ASSERT(obj);
- BT_LIB_LOGD("Destroying string field classe object: %!+F", obj);
+ BT_LIB_LOGD("Destroying string field class object: %!+F", obj);
g_free(obj);
}
-struct bt_field_class *bt_field_class_string_create(void)
+struct bt_private_field_class *bt_private_field_class_string_create(void)
{
struct bt_field_class_string *string_fc = NULL;
- BT_LOGD_STR("Creating default string field classe object.");
+ BT_LOGD_STR("Creating default string field class object.");
string_fc = g_new0(struct bt_field_class_string, 1);
if (!string_fc) {
- BT_LOGE_STR("Failed to allocate one string field classe.");
+ BT_LOGE_STR("Failed to allocate one string field class.");
goto error;
}
- init_field_class((void *) string_fc, BT_FIELD_CLASS_ID_STRING,
+ init_field_class((void *) string_fc, BT_FIELD_CLASS_TYPE_STRING,
destroy_string_field_class);
- BT_LIB_LOGD("Created string field classe object: %!+F", string_fc);
+ BT_LIB_LOGD("Created string field class object: %!+F", string_fc);
goto end;
error:
- BT_PUT(string_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(string_fc);
end:
return (void *) string_fc;
"Field class is already part of a trace: %!+F", fc);
fc->part_of_trace = true;
- switch (fc->id) {
- case BT_FIELD_CLASS_ID_STRUCTURE:
- case BT_FIELD_CLASS_ID_VARIANT:
+ switch (fc->type) {
+ case BT_FIELD_CLASS_TYPE_STRUCTURE:
+ case BT_FIELD_CLASS_TYPE_VARIANT:
{
struct bt_field_class_named_field_class_container *container_fc =
(void *) fc;
break;
}
- case BT_FIELD_CLASS_ID_STATIC_ARRAY:
- case BT_FIELD_CLASS_ID_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
struct bt_field_class_array *array_fc = (void *) fc;
projects / babeltrace.git / blobdiff