.reset = reset_single_field,
};
+static
+struct bt_field_methods bit_array_field_methods = {
+ .set_is_frozen = set_single_field_is_frozen,
+ .is_set = single_field_is_set,
+ .reset = reset_single_field,
+};
+
static
struct bt_field_methods integer_field_methods = {
.set_is_frozen = set_single_field_is_frozen,
static
struct bt_field *create_bool_field(struct bt_field_class *);
+static
+struct bt_field *create_bit_array_field(struct bt_field_class *);
+
static
struct bt_field *create_integer_field(struct bt_field_class *);
static
struct bt_field *create_structure_field(struct bt_field_class *);
-
static
struct bt_field *create_static_array_field(struct bt_field_class *);
static
struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = {
- [BT_FIELD_CLASS_TYPE_BOOL] = create_bool_field,
- [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = create_integer_field,
- [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = create_integer_field,
- [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = create_integer_field,
- [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = create_integer_field,
- [BT_FIELD_CLASS_TYPE_REAL] = create_real_field,
- [BT_FIELD_CLASS_TYPE_STRING] = create_string_field,
- [BT_FIELD_CLASS_TYPE_STRUCTURE] = create_structure_field,
- [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = create_static_array_field,
- [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY] = create_dynamic_array_field,
- [BT_FIELD_CLASS_TYPE_OPTION] = create_option_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR] = create_variant_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR] = create_variant_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR] = create_variant_field,
+ [BT_FIELD_CLASS_TYPE_BOOL] = create_bool_field,
+ [BT_FIELD_CLASS_TYPE_BIT_ARRAY] = create_bit_array_field,
+ [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = create_integer_field,
+ [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = create_integer_field,
+ [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = create_integer_field,
+ [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = create_integer_field,
+ [BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL] = create_real_field,
+ [BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL] = create_real_field,
+ [BT_FIELD_CLASS_TYPE_STRING] = create_string_field,
+ [BT_FIELD_CLASS_TYPE_STRUCTURE] = create_structure_field,
+ [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = create_static_array_field,
+ [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD] = create_dynamic_array_field,
+ [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD] = create_dynamic_array_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD] = create_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD] = create_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD] = create_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD] = create_option_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD] = create_variant_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD] = create_variant_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD] = create_variant_field,
};
static
void destroy_bool_field(struct bt_field *field);
+static
+void destroy_bit_array_field(struct bt_field *field);
+
static
void destroy_integer_field(struct bt_field *field);
static
void (* const field_destroy_funcs[])(struct bt_field *) = {
- [BT_FIELD_CLASS_TYPE_BOOL] = destroy_bool_field,
- [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = destroy_integer_field,
- [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = destroy_integer_field,
- [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = destroy_integer_field,
- [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = destroy_integer_field,
- [BT_FIELD_CLASS_TYPE_REAL] = destroy_real_field,
- [BT_FIELD_CLASS_TYPE_STRING] = destroy_string_field,
- [BT_FIELD_CLASS_TYPE_STRUCTURE] = destroy_structure_field,
- [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = destroy_array_field,
- [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY] = destroy_array_field,
- [BT_FIELD_CLASS_TYPE_OPTION] = destroy_option_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR] = destroy_variant_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR] = destroy_variant_field,
- [BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR] = destroy_variant_field,
+ [BT_FIELD_CLASS_TYPE_BOOL] = destroy_bool_field,
+ [BT_FIELD_CLASS_TYPE_BIT_ARRAY] = destroy_bit_array_field,
+ [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = destroy_integer_field,
+ [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = destroy_integer_field,
+ [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = destroy_integer_field,
+ [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = destroy_integer_field,
+ [BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL] = destroy_real_field,
+ [BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL] = destroy_real_field,
+ [BT_FIELD_CLASS_TYPE_STRING] = destroy_string_field,
+ [BT_FIELD_CLASS_TYPE_STRUCTURE] = destroy_structure_field,
+ [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = destroy_array_field,
+ [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD] = destroy_array_field,
+ [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD] = destroy_array_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD] = destroy_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD] = destroy_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD] = destroy_option_field,
+ [BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD] = destroy_option_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD] = destroy_variant_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD] = destroy_variant_field,
+ [BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD] = destroy_variant_field,
};
-struct bt_field_class *bt_field_borrow_class(const struct bt_field *field)
+struct bt_field_class *bt_field_borrow_class(struct bt_field *field)
{
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
return field->class;
bt_object_init_unique(&field->base);
field->methods = methods;
field->class = fc;
- bt_object_get_no_null_check(fc);
+ bt_object_get_ref_no_null_check(fc);
}
static
return (void *) bool_field;
}
+static
+struct bt_field *create_bit_array_field(struct bt_field_class *fc)
+{
+ struct bt_field_bit_array *ba_field;
+
+ BT_LIB_LOGD("Creating bit array field object: %![fc-]+F", fc);
+ ba_field = g_new0(struct bt_field_bit_array, 1);
+ if (!ba_field) {
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one bit array field.");
+ goto end;
+ }
+
+ init_field((void *) ba_field, fc, &bit_array_field_methods);
+ BT_LIB_LOGD("Created bit array field object: %!+f", ba_field);
+
+end:
+ return (void *) ba_field;
+}
+
static
struct bt_field *create_integer_field(struct bt_field_class *fc)
{
sizeof(char), 1);
if (!string_field->buf) {
BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GArray.");
- BT_OBJECT_PUT_REF_AND_RESET(string_field);
+ bt_field_destroy((void *) string_field);
+ string_field = NULL;
goto end;
}
&struct_field->fields)) {
BT_LIB_LOGE_APPEND_CAUSE(
"Cannot create structure member fields: %![fc-]+F", fc);
- BT_OBJECT_PUT_REF_AND_RESET(struct_field);
+ bt_field_destroy((void *) struct_field);
+ struct_field = NULL;
goto end;
}
"Failed to create option field's content field: "
"%![opt-fc-]+F, %![content-fc-]+F",
opt_fc, opt_fc->content_fc);
- BT_OBJECT_PUT_REF_AND_RESET(opt_field);
+ bt_field_destroy((void *) opt_field);
+ opt_field = NULL;
goto end;
}
&var_field->fields)) {
BT_LIB_LOGE_APPEND_CAUSE("Cannot create variant member fields: "
"%![fc-]+F", fc);
- BT_OBJECT_PUT_REF_AND_RESET(var_field);
+ bt_field_destroy((void *) var_field);
+ var_field = NULL;
goto end;
}
if (init_array_field_fields(array_field)) {
BT_LIB_LOGE_APPEND_CAUSE("Cannot create static array fields: "
"%![fc-]+F", fc);
- BT_OBJECT_PUT_REF_AND_RESET(array_field);
+ bt_field_destroy((void *) array_field);
+ array_field = NULL;
goto end;
}
if (init_array_field_fields(array_field)) {
BT_LIB_LOGE_APPEND_CAUSE("Cannot create dynamic array fields: "
"%![fc-]+F", fc);
- BT_OBJECT_PUT_REF_AND_RESET(array_field);
+ bt_field_destroy((void *) array_field);
+ array_field = NULL;
goto end;
}
bt_field_set_single(field, true);
}
+uint64_t bt_field_bit_array_get_value_as_integer(const struct bt_field *field)
+{
+ const struct bt_field_bit_array *ba_field = (const void *) field;
+
+ BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_IS_SET(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_BIT_ARRAY, "Field");
+ return ba_field->value_as_int;
+}
+
+void bt_field_bit_array_set_value_as_integer(struct bt_field *field,
+ uint64_t value)
+{
+ struct bt_field_bit_array *ba_field = (void *) field;
+ struct bt_field_class_bit_array *ba_fc;
+
+ BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_BIT_ARRAY, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
+ ba_fc = (void *) field->class;
+ ba_field->value_as_int = value;
+
+ if (ba_fc->length < 64) {
+ /* Apply mask */
+ ba_field->value_as_int &= ((UINT64_C(1) << ba_fc->length) - 1);
+ }
+
+ bt_field_set_single(field, true);
+}
+
int64_t bt_field_integer_signed_get_value(const struct bt_field *field)
{
const struct bt_field_integer *int_field = (const void *) field;
bt_field_set_single(field, true);
}
-double bt_field_real_get_value(const struct bt_field *field)
+float bt_field_real_single_precision_get_value(const struct bt_field *field)
+{
+ const struct bt_field_real *real_field = (const void *) field;
+
+ BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_IS_SET(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL, "Field");
+ return (float) real_field->value;
+}
+
+double bt_field_real_double_precision_get_value(const struct bt_field *field)
{
const struct bt_field_real *real_field = (const void *) field;
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
BT_ASSERT_PRE_DEV_FIELD_IS_SET(field, "Field");
- BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL, "Field");
+
return real_field->value;
}
-void bt_field_real_set_value(struct bt_field *field, double value)
+void bt_field_real_single_precision_set_value(struct bt_field *field,
+ float value)
+{
+ struct bt_field_real *real_field = (void *) field;
+
+ BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
+
+ real_field->value = (double) value;
+ bt_field_set_single(field, true);
+}
+
+void bt_field_real_double_precision_set_value(struct bt_field *field,
+ double value)
{
struct bt_field_real *real_field = (void *) field;
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
- BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
+ BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL, "Field");
BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
- BT_ASSERT_PRE_DEV(
- !((struct bt_field_class_real *) field->class)->is_single_precision ||
- (double) (float) value == value,
- "Invalid value for a single-precision real number: value=%f, "
- "%![fc-]+F", value, field->class);
+
real_field->value = value;
bt_field_set_single(field, true);
}
struct bt_field_array *array_field = (void *) field;
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
- BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
- BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_IS_DYNAMIC_ARRAY(field, "Field");
BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
if (G_UNLIKELY(length > array_field->fields->len)) {
struct bt_field_option *opt_field = (void *) field;
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
- BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
- BT_FIELD_CLASS_TYPE_OPTION, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
if (has_field) {
struct bt_field_option *opt_field = (void *) field;
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
- BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
- BT_FIELD_CLASS_TYPE_OPTION, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
return opt_field->selected_field;
}
return borrow_variant_field_selected_class_option(field);
}
-const struct bt_field_class_variant_with_selector_unsigned_option *
-bt_field_variant_with_unsigned_selector_borrow_selected_class_option_const(
+const struct bt_field_class_variant_with_selector_field_integer_unsigned_option *
+bt_field_variant_with_unsigned_integer_selector_borrow_selected_class_option_const(
const struct bt_field *field)
{
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, "Field");
+ BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field");
return (const void *) borrow_variant_field_selected_class_option(field);
}
-const struct bt_field_class_variant_with_selector_signed_option *
-bt_field_variant_with_signed_selector_borrow_selected_class_option_const(
+const struct bt_field_class_variant_with_selector_field_integer_signed_option *
+bt_field_variant_with_signed_integer_selector_borrow_selected_class_option_const(
const struct bt_field *field)
{
BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, "Field");
+ BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field");
return (const void *) borrow_variant_field_selected_class_option(field);
}
g_free(field);
}
+static
+void destroy_bit_array_field(struct bt_field *field)
+{
+ BT_ASSERT(field);
+ BT_LIB_LOGD("Destroying bit array field object: %!+f", field);
+ bt_field_finalize(field);
+ g_free(field);
+}
+
static
void destroy_integer_field(struct bt_field *field)
{