static
bool variant_field_is_set(const struct bt_field *field);
+static
+struct bt_field_methods bool_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,
.reset = reset_variant_field,
};
+static
+struct bt_field *create_bool_field(struct bt_field_class *);
+
static
struct bt_field *create_integer_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_VARIANT_WITH_SIGNED_SELECTOR] = create_variant_field,
};
+static
+void destroy_bool_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_object_get_no_null_check(fc);
}
+static
+struct bt_field *create_bool_field(struct bt_field_class *fc)
+{
+ struct bt_field_bool *bool_field;
+
+ BT_LIB_LOGD("Creating boolean field object: %![fc-]+F", fc);
+ bool_field = g_new0(struct bt_field_bool, 1);
+ if (!bool_field) {
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one boolean field.");
+ goto end;
+ }
+
+ init_field((void *) bool_field, fc, &bool_field_methods);
+ BT_LIB_LOGD("Created boolean field object: %!+f", bool_field);
+
+end:
+ return (void *) bool_field;
+}
+
static
struct bt_field *create_integer_field(struct bt_field_class *fc)
{
static
struct bt_field *create_static_array_field(struct bt_field_class *fc)
{
- struct bt_field_class_static_array *array_fc = (void *) fc;
+ struct bt_field_class_array_static *array_fc = (void *) fc;
struct bt_field_array *array_field;
BT_LIB_LOGD("Creating static array field object: %![fc-]+F", fc);
return (void *) array_field;
}
-int64_t bt_field_signed_integer_get_value(const struct bt_field *field)
+bt_bool bt_field_bool_get_value(const struct bt_field *field)
+{
+ const struct bt_field_bool *bool_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_BOOL,
+ "Field");
+ return (bt_bool) bool_field->value;
+}
+
+void bt_field_bool_set_value(struct bt_field *field, bt_bool value)
+{
+ struct bt_field_bool *bool_field = (void *) field;
+
+ BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_BOOL,
+ "Field");
+ BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
+ bool_field->value = (bool) value;
+ 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;
return int_field->value.i;
}
-void bt_field_signed_integer_set_value(struct bt_field *field, int64_t value)
+void bt_field_integer_signed_set_value(struct bt_field *field, int64_t value)
{
struct bt_field_integer *int_field = (void *) field;
bt_field_set_single(field, true);
}
-uint64_t bt_field_unsigned_integer_get_value(const struct bt_field *field)
+uint64_t bt_field_integer_unsigned_get_value(const struct bt_field *field)
{
const struct bt_field_integer *int_field = (const void *) field;
return int_field->value.u;
}
-void bt_field_unsigned_integer_set_value(struct bt_field *field, uint64_t value)
+void bt_field_integer_unsigned_set_value(struct bt_field *field, uint64_t value)
{
struct bt_field_integer *int_field = (void *) field;
}
enum bt_field_enumeration_get_mapping_labels_status
-bt_field_unsigned_enumeration_get_mapping_labels(
+bt_field_enumeration_unsigned_get_mapping_labels(
const struct bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count)
BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field");
return (int)
- bt_field_class_unsigned_enumeration_get_mapping_labels_for_value(
+ bt_field_class_enumeration_unsigned_get_mapping_labels_for_value(
field->class, int_field->value.u, label_array, count);
}
enum bt_field_enumeration_get_mapping_labels_status
-bt_field_signed_enumeration_get_mapping_labels(
+bt_field_enumeration_signed_get_mapping_labels(
const struct bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count)
BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field");
return (int)
- bt_field_class_signed_enumeration_get_mapping_labels_for_value(
+ bt_field_class_enumeration_signed_get_mapping_labels_for_value(
field->class, int_field->value.i, label_array, count);
}
BT_FIELD_CLASS_TYPE_STRING, "Field");
/* Make sure no null bytes are appended */
- BT_ASSERT_PRE_DEV(memchr(value, '\0', length) == NULL,
+ BT_ASSERT_PRE_DEV(!memchr(value, '\0', length),
"String value to append contains a null character: "
"partial-value=\"%.32s\", length=%" PRIu64, value, length);
return array_field->length;
}
-enum bt_field_dynamic_array_set_length_status bt_field_dynamic_array_set_length(
+enum bt_field_array_dynamic_set_length_status bt_field_array_dynamic_set_length(
struct bt_field *field, uint64_t length)
{
int ret = BT_FUNC_STATUS_OK;
return borrow_variant_field_selected_class_option(field);
}
-const struct bt_field_class_variant_with_unsigned_selector_option *
+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 *field)
{
return (const void *) borrow_variant_field_selected_class_option(field);
}
-const struct bt_field_class_variant_with_signed_selector_option *
+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 *field)
{
BT_OBJECT_PUT_REF_AND_RESET(field->class);
}
+static
+void destroy_bool_field(struct bt_field *field)
+{
+ BT_ASSERT(field);
+ BT_LIB_LOGD("Destroying boolean field object: %!+f", field);
+ bt_field_finalize(field);
+ g_free(field);
+}
+
static
void destroy_integer_field(struct bt_field *field)
{