X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.c;h=c53d7fafc5325fd5b48e356962315448911952e6;hb=7704a0af9f2275321f8294df8c02f8a299b3134e;hp=26160c20d0d0ca013e29d0a0bd0f1102ca4c8556;hpb=8e01f2d9837d5ba9a85c678121dcc8adf8dbe72e;p=babeltrace.git

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index 26160c20..c53d7faf 100644
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -26,13 +26,13 @@
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/field.h>
-#include <babeltrace2/trace-ir/field-const.h>
 #include "lib/object.h"
 #include "compat/compiler.h"
 #include "compat/fcntl.h"
 #include "common/align.h"
 #include "common/assert.h"
 #include <inttypes.h>
+#include <stdbool.h>
 
 #include "field.h"
 #include "field-class.h"
@@ -47,6 +47,9 @@ void reset_array_field(struct bt_field *field);
 static
 void reset_structure_field(struct bt_field *field);
 
+static
+void reset_option_field(struct bt_field *field);
+
 static
 void reset_variant_field(struct bt_field *field);
 
@@ -59,6 +62,9 @@ void set_array_field_is_frozen(struct bt_field *field, bool is_frozen);
 static
 void set_structure_field_is_frozen(struct bt_field *field, bool is_frozen);
 
+static
+void set_option_field_is_frozen(struct bt_field *field, bool is_frozen);
+
 static
 void set_variant_field_is_frozen(struct bt_field *field, bool is_frozen);
 
@@ -71,9 +77,26 @@ bool array_field_is_set(const struct bt_field *field);
 static
 bool structure_field_is_set(const struct bt_field *field);
 
+static
+bool option_field_is_set(const struct bt_field *field);
+
 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 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,
@@ -109,6 +132,13 @@ struct bt_field_methods array_field_methods = {
 	.reset = reset_array_field,
 };
 
+static
+struct bt_field_methods option_field_methods = {
+	.set_is_frozen = set_option_field_is_frozen,
+	.is_set = option_field_is_set,
+	.reset = reset_option_field,
+};
+
 static
 struct bt_field_methods variant_field_methods = {
 	.set_is_frozen = set_variant_field_is_frozen,
@@ -116,6 +146,12 @@ struct bt_field_methods variant_field_methods = {
 	.reset = reset_variant_field,
 };
 
+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 *);
 
@@ -134,24 +170,17 @@ struct bt_field *create_static_array_field(struct bt_field_class *);
 static
 struct bt_field *create_dynamic_array_field(struct bt_field_class *);
 
+static
+struct bt_field *create_option_field(struct bt_field_class *);
+
 static
 struct bt_field *create_variant_field(struct bt_field_class *);
 
 static
-struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = {
-	[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_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,
-};
+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);
@@ -169,25 +198,12 @@ static
 void destroy_array_field(struct bt_field *field);
 
 static
-void destroy_variant_field(struct bt_field *field);
+void destroy_option_field(struct bt_field *field);
 
 static
-void (* const field_destroy_funcs[])(struct bt_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_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,
-};
+void destroy_variant_field(struct bt_field *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;
@@ -212,7 +228,52 @@ struct bt_field *bt_field_create(struct bt_field_class *fc)
 	struct bt_field *field = NULL;
 
 	BT_ASSERT(fc);
-	field = field_create_funcs[fc->type](fc);
+
+	switch (fc->type) {
+	case BT_FIELD_CLASS_TYPE_BOOL:
+		field = create_bool_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+		field = create_bit_array_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
+	case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
+		field = create_integer_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+	case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+		field = create_real_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_STRING:
+		field = create_string_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_STRUCTURE:
+		field = create_structure_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
+		field = create_static_array_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
+		field = create_dynamic_array_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		field = create_option_field(fc);
+		break;
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		field = create_variant_field(fc);
+		break;
+	default:
+		bt_common_abort();
+	}
+
 	if (!field) {
 		BT_LIB_LOGE_APPEND_CAUSE("Cannot create field object from field class: "
 			"%![fc-]+F", fc);
@@ -232,7 +293,47 @@ void init_field(struct bt_field *field, struct bt_field_class *fc,
 	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
+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_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
@@ -292,7 +393,8 @@ struct bt_field *create_string_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;
 	}
 
@@ -361,7 +463,8 @@ struct bt_field *create_structure_field(struct bt_field_class *fc)
 			&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;
 	}
 
@@ -371,6 +474,38 @@ end:
 	return (void *) struct_field;
 }
 
+static
+struct bt_field *create_option_field(struct bt_field_class *fc)
+{
+	struct bt_field_option *opt_field;
+	struct bt_field_class_option *opt_fc = (void *) fc;
+
+	BT_LIB_LOGD("Creating option field object: %![fc-]+F", fc);
+	opt_field = g_new0(struct bt_field_option, 1);
+	if (!opt_field) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one option field.");
+		goto end;
+	}
+
+	init_field((void *) opt_field, fc, &option_field_methods);
+	opt_field->content_field = bt_field_create(opt_fc->content_fc);
+	if (!opt_field->content_field) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to create option field's content field: "
+			"%![opt-fc-]+F, %![content-fc-]+F",
+			opt_fc, opt_fc->content_fc);
+		bt_field_destroy((void *) opt_field);
+		opt_field = NULL;
+		goto end;
+	}
+
+	BT_LIB_LOGD("Created option field object: %!+f", opt_field);
+
+end:
+	return (void *) opt_field;
+}
+
 static
 struct bt_field *create_variant_field(struct bt_field_class *fc)
 {
@@ -390,7 +525,8 @@ struct bt_field *create_variant_field(struct bt_field_class *fc)
 			&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;
 	}
 
@@ -456,7 +592,8 @@ struct bt_field *create_static_array_field(struct bt_field_class *fc)
 	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;
 	}
 
@@ -484,7 +621,8 @@ struct bt_field *create_dynamic_array_field(struct bt_field_class *fc)
 	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;
 	}
 
@@ -494,6 +632,61 @@ end:
 	return (void *) array_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);
+}
+
+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;
@@ -544,28 +737,53 @@ void bt_field_integer_unsigned_set_value(struct bt_field *field, uint64_t value)
 	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_REAL, "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_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);
 }
@@ -578,6 +796,7 @@ bt_field_enumeration_unsigned_get_mapping_labels(
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
 	BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Count (output)");
@@ -597,6 +816,7 @@ bt_field_enumeration_signed_get_mapping_labels(
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
 	BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Count (output)");
@@ -635,7 +855,7 @@ void clear_string_field(struct bt_field *field)
 {
 	struct bt_field_string *string_field = (void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	string_field->length = 0;
 	bt_field_set_single(field, true);
 }
@@ -643,6 +863,7 @@ void clear_string_field(struct bt_field *field)
 enum bt_field_string_set_value_status bt_field_string_set_value(
 		struct bt_field *field, const char *value)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_NON_NULL(value, "Value");
 	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
@@ -656,6 +877,8 @@ enum bt_field_string_set_value_status bt_field_string_set_value(
 enum bt_field_string_append_status bt_field_string_append(
 		struct bt_field *field, const char *value)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+
 	return bt_field_string_append_with_length(field,
 		value, (uint64_t) strlen(value));
 }
@@ -667,6 +890,7 @@ enum bt_field_string_append_status bt_field_string_append_with_length(
 	char *data;
 	uint64_t new_length;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_NON_NULL(value, "Value");
 	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
@@ -716,9 +940,9 @@ enum bt_field_array_dynamic_set_length_status bt_field_array_dynamic_set_length(
 	int ret = BT_FUNC_STATUS_OK;
 	struct bt_field_array *array_field = (void *) field;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	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)) {
@@ -744,7 +968,7 @@ enum bt_field_array_dynamic_set_length_status bt_field_array_dynamic_set_length(
 				goto end;
 			}
 
-			BT_ASSERT(!array_field->fields->pdata[i]);
+			BT_ASSERT_DBG(!array_field->fields->pdata[i]);
 			array_field->fields->pdata[i] = elem_field;
 		}
 	}
@@ -830,7 +1054,7 @@ struct bt_field *borrow_structure_field_member_field_by_name(
 	}
 
 	ret_field = struct_field->fields->pdata[GPOINTER_TO_UINT(index)];
-	BT_ASSERT(ret_field);
+	BT_ASSERT_DBG(ret_field);
 
 end:
 	return ret_field;
@@ -849,6 +1073,36 @@ const struct bt_field *bt_field_structure_borrow_member_field_by_name_const(
 		(void *) field, name);
 }
 
+void bt_field_option_set_has_field(struct bt_field *field, bt_bool has_field)
+{
+	struct bt_field_option *opt_field = (void *) field;
+
+	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
+
+	if (has_field) {
+		opt_field->selected_field = opt_field->content_field;
+	} else {
+		opt_field->selected_field = NULL;
+	}
+}
+
+struct bt_field *bt_field_option_borrow_field(struct bt_field *field)
+{
+	struct bt_field_option *opt_field = (void *) field;
+
+	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(field, "Field");
+	return opt_field->selected_field;
+}
+
+const struct bt_field *bt_field_option_borrow_field_const(
+		const struct bt_field *field)
+{
+	return (const void *) bt_field_option_borrow_field((void *) field);
+}
+
 static inline
 struct bt_field *borrow_variant_field_selected_option_field(
 		struct bt_field *field)
@@ -881,7 +1135,7 @@ borrow_variant_field_selected_class_option(const struct bt_field *field)
 	const struct bt_field_class_named_field_class_container *container_fc;
 	const struct bt_field_variant *var_field = (const void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	BT_ASSERT_PRE_DEV(var_field->selected_field,
 		"Variant field has no selected field: %!+f", field);
 	container_fc = (const void *) field->class;
@@ -889,7 +1143,7 @@ borrow_variant_field_selected_class_option(const struct bt_field *field)
 }
 
 const struct bt_field_class_variant_option *
-bt_field_variant_borrow_selected_class_option_const(
+bt_field_variant_borrow_selected_option_class_const(
 		const struct bt_field *field)
 {
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
@@ -897,32 +1151,33 @@ bt_field_variant_borrow_selected_class_option_const(
 	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_selector_field_integer_unsigned_borrow_selected_option_class_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_selector_field_integer_signed_borrow_selected_option_class_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);
 }
 
-enum bt_field_variant_select_option_field_by_index_status
-bt_field_variant_select_option_field_by_index(
+enum bt_field_variant_select_option_by_index_status
+bt_field_variant_select_option_by_index(
 		struct bt_field *field, uint64_t index)
 {
 	struct bt_field_variant *var_field = (void *) field;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
 	BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT(field, "Field");
 	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
@@ -932,7 +1187,7 @@ bt_field_variant_select_option_field_by_index(
 	return BT_FUNC_STATUS_OK;
 }
 
-uint64_t bt_field_variant_get_selected_option_field_index(
+uint64_t bt_field_variant_get_selected_option_index(
 		const struct bt_field *field)
 {
 	const struct bt_field_variant *var_field = (const void *) field;
@@ -952,6 +1207,24 @@ void bt_field_finalize(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_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)
 {
@@ -987,6 +1260,22 @@ void destroy_structure_field(struct bt_field *field)
 	g_free(field);
 }
 
+static
+void destroy_option_field(struct bt_field *field)
+{
+	struct bt_field_option *opt_field = (void *) field;
+
+	BT_ASSERT(field);
+	BT_LIB_LOGD("Destroying option field object: %!+f", field);
+	bt_field_finalize(field);
+
+	if (opt_field->content_field) {
+		bt_field_destroy(opt_field->content_field);
+	}
+
+	g_free(field);
+}
+
 static
 void destroy_variant_field(struct bt_field *field)
 {
@@ -1042,13 +1331,55 @@ BT_HIDDEN
 void bt_field_destroy(struct bt_field *field)
 {
 	BT_ASSERT(field);
-	field_destroy_funcs[field->class->type](field);
+
+	switch (field->class->type) {
+	case BT_FIELD_CLASS_TYPE_BOOL:
+		destroy_bool_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+		destroy_bit_array_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
+	case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
+		destroy_integer_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+	case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+		destroy_real_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_STRING:
+		destroy_string_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_STRUCTURE:
+		destroy_structure_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
+		destroy_array_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		destroy_option_field(field);
+		break;
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+		destroy_variant_field(field);
+		break;
+	default:
+		bt_common_abort();
+	}
 }
 
 static
 void reset_single_field(struct bt_field *field)
 {
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	field->is_set = false;
 }
 
@@ -1058,20 +1389,30 @@ void reset_structure_field(struct bt_field *field)
 	uint64_t i;
 	struct bt_field_structure *struct_field = (void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	for (i = 0; i < struct_field->fields->len; i++) {
 		bt_field_reset(struct_field->fields->pdata[i]);
 	}
 }
 
+static
+void reset_option_field(struct bt_field *field)
+{
+	struct bt_field_option *opt_field = (void *) field;
+
+	BT_ASSERT_DBG(opt_field);
+	bt_field_reset(opt_field->content_field);
+	opt_field->selected_field = NULL;
+}
+
 static
 void reset_variant_field(struct bt_field *field)
 {
 	uint64_t i;
 	struct bt_field_variant *var_field = (void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	for (i = 0; i < var_field->fields->len; i++) {
 		bt_field_reset(var_field->fields->pdata[i]);
@@ -1084,7 +1425,7 @@ void reset_array_field(struct bt_field *field)
 	uint64_t i;
 	struct bt_field_array *array_field = (void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	for (i = 0; i < array_field->fields->len; i++) {
 		bt_field_reset(array_field->fields->pdata[i]);
@@ -1112,12 +1453,23 @@ void set_structure_field_is_frozen(struct bt_field *field, bool is_frozen)
 		BT_LIB_LOGD("Setting structure field's member field's "
 			"frozen state: %![field-]+f, index=%" PRIu64,
 			member_field, i);
-		bt_field_set_is_frozen(member_field, is_frozen);
+		_bt_field_set_is_frozen(member_field, is_frozen);
 	}
 
 	set_single_field_is_frozen(field, is_frozen);
 }
 
+static
+void set_option_field_is_frozen(struct bt_field *field, bool is_frozen)
+{
+	struct bt_field_option *opt_field = (void *) field;
+
+	BT_LIB_LOGD("Setting option field's frozen state: "
+		"%![field-]+f, is-frozen=%d", field, is_frozen);
+	_bt_field_set_is_frozen(opt_field->content_field, is_frozen);
+	set_single_field_is_frozen(field, is_frozen);
+}
+
 static
 void set_variant_field_is_frozen(struct bt_field *field, bool is_frozen)
 {
@@ -1133,7 +1485,7 @@ void set_variant_field_is_frozen(struct bt_field *field, bool is_frozen)
 		BT_LIB_LOGD("Setting variant field's option field's "
 			"frozen state: %![field-]+f, index=%" PRIu64,
 			option_field, i);
-		bt_field_set_is_frozen(option_field, is_frozen);
+		_bt_field_set_is_frozen(option_field, is_frozen);
 	}
 
 	set_single_field_is_frozen(field, is_frozen);
@@ -1154,7 +1506,7 @@ void set_array_field_is_frozen(struct bt_field *field, bool is_frozen)
 		BT_LIB_LOGD("Setting array field's element field's "
 			"frozen state: %![field-]+f, index=%" PRIu64,
 			elem_field, i);
-		bt_field_set_is_frozen(elem_field, is_frozen);
+		_bt_field_set_is_frozen(elem_field, is_frozen);
 	}
 
 	set_single_field_is_frozen(field, is_frozen);
@@ -1164,17 +1516,17 @@ BT_HIDDEN
 void _bt_field_set_is_frozen(const struct bt_field *field,
 		bool is_frozen)
 {
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	BT_LIB_LOGD("Setting field object's frozen state: %!+f, is-frozen=%d",
 		field, is_frozen);
-	BT_ASSERT(field->methods->set_is_frozen);
+	BT_ASSERT_DBG(field->methods->set_is_frozen);
 	field->methods->set_is_frozen((void *) field, is_frozen);
 }
 
 static
 bool single_field_is_set(const struct bt_field *field)
 {
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	return field->is_set;
 }
 
@@ -1185,7 +1537,7 @@ bool structure_field_is_set(const struct bt_field *field)
 	uint64_t i;
 	const struct bt_field_structure *struct_field = (const void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	for (i = 0; i < struct_field->fields->len; i++) {
 		is_set = bt_field_is_set(struct_field->fields->pdata[i]);
@@ -1198,13 +1550,28 @@ end:
 	return is_set;
 }
 
+static
+bool option_field_is_set(const struct bt_field *field)
+{
+	const struct bt_field_option *opt_field = (const void *) field;
+	bool is_set = false;
+
+	BT_ASSERT_DBG(field);
+
+	if (opt_field->selected_field) {
+		is_set = bt_field_is_set(opt_field->selected_field);
+	}
+
+	return is_set;
+}
+
 static
 bool variant_field_is_set(const struct bt_field *field)
 {
 	const struct bt_field_variant *var_field = (const void *) field;
 	bool is_set = false;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	if (var_field->selected_field) {
 		is_set = bt_field_is_set(var_field->selected_field);
@@ -1220,7 +1587,7 @@ bool array_field_is_set(const struct bt_field *field)
 	uint64_t i;
 	const struct bt_field_array *array_field = (const void *) field;
 
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 
 	for (i = 0; i < array_field->length; i++) {
 		is_set = bt_field_is_set(array_field->fields->pdata[i]);