X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.c;h=4d6db1337eda5679ba05fd9f5a025745c5e89a26;hp=805de0f8f63779f20c383a4115d7c07651a586b9;hb=867eb7632255f6a84234542198bd7edaac1bce12;hpb=185ecf645233ced089ad72b060a420e8f6f7edeb

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index 805de0f8..4d6db133 100644
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -1,43 +1,31 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #define BT_LOG_TAG "LIB/FIELD"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.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"
 #include "lib/func-status.h"
 
+#define BT_ASSERT_PRE_DEV_FIELD_HOT(_field)				\
+	BT_ASSERT_PRE_DEV_HOT("field",					\
+		(const struct bt_field *) (_field), "Field", ": %!+f", (_field))
+
 static
 void reset_single_field(struct bt_field *field);
 
@@ -47,6 +35,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 +50,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 +65,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 +120,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 +134,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,22 +158,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]		= 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);
@@ -167,38 +186,27 @@ 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]		= 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_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
 	return field->class;
 }
 
 const struct bt_field_class *bt_field_borrow_class_const(
 		const struct bt_field *field)
 {
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
 	return field->class;
 }
 
 enum bt_field_class_type bt_field_get_class_type(const struct bt_field *field)
 {
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
 	return field->class->type;
 }
 
@@ -207,9 +215,53 @@ struct bt_field *bt_field_create(struct bt_field_class *fc)
 {
 	struct bt_field *field = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-	BT_ASSERT(bt_field_class_has_known_type(fc));
-	field = field_create_funcs[fc->type](fc);
+	BT_ASSERT(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);
@@ -229,7 +281,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
@@ -289,7 +381,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;
 	}
 
@@ -320,8 +413,7 @@ int create_fields_from_named_field_classes(
 
 	for (i = 0; i < fc->named_fcs->len; i++) {
 		struct bt_field *field;
-		struct bt_named_field_class *named_fc =
-			BT_FIELD_CLASS_NAMED_FC_AT_INDEX(fc, i);
+		struct bt_named_field_class *named_fc = fc->named_fcs->pdata[i];
 
 		field = bt_field_create(named_fc->fc);
 		if (!field) {
@@ -359,7 +451,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;
 	}
 
@@ -369,6 +462,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)
 {
@@ -388,7 +513,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;
 	}
 
@@ -437,7 +563,7 @@ end:
 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);
@@ -454,7 +580,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;
 	}
 
@@ -482,7 +609,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;
 	}
 
@@ -492,117 +620,210 @@ end:
 	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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"boolean-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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"boolean-field", BT_FIELD_CLASS_TYPE_BOOL, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"bit-array-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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"bit-array-field", BT_FIELD_CLASS_TYPE_BIT_ARRAY, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(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_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SIGNED_INT(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SIGNED_INT("field", field, "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_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SIGNED_INT(field, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE(bt_util_value_is_in_range_signed(
-		((struct bt_field_class_integer *) field->class)->range, value),
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SIGNED_INT("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+	BT_ASSERT_PRE_DEV("valid-value-for-field-class-field-value-range",
+		bt_util_value_is_in_range_signed(
+			((struct bt_field_class_integer *) field->class)->range,
+			value),
 		"Value is out of bounds: value=%" PRId64 ", %![field-]+f, "
 		"%![fc-]+F", value, field, field->class);
 	int_field->value.i = value;
 	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;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_UNSIGNED_INT(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_UNSIGNED_INT("field", field, "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;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_UNSIGNED_INT(field, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE(bt_util_value_is_in_range_unsigned(
-		((struct bt_field_class_integer *) field->class)->range, value),
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_UNSIGNED_INT("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+	BT_ASSERT_PRE_DEV("valid-value-for-field-class-field-value-range",
+		bt_util_value_is_in_range_unsigned(
+			((struct bt_field_class_integer *) field->class)->range,
+			value),
 		"Value is out of bounds: value=%" PRIu64 ", %![field-]+f, "
 		"%![fc-]+F", value, field, field->class);
 	int_field->value.u = 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_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"single-precision-real-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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"double-precision-real-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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"single-precision-real-field",
+		BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(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_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE(
-		!((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);
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"double-precision-real-field",
+		BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+
 	real_field->value = value;
 	bt_field_set_single(field, true);
 }
 
 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)
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)");
-	BT_ASSERT_PRE_NON_NULL(label_array, "Count (output)");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array,
+		"Label array (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)");
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"unsigned-enumeration-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)
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)");
-	BT_ASSERT_PRE_NON_NULL(label_array, "Count (output)");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array,
+		"Label array (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)");
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"signed-enumeration-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);
 }
 
@@ -610,10 +831,10 @@ const char *bt_field_string_get_value(const struct bt_field *field)
 {
 	const struct bt_field_string *string_field = (const void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING,
-		"Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field, "string-field",
+		BT_FIELD_CLASS_TYPE_STRING, "Field");
 	return (const char *) string_field->buf->data;
 }
 
@@ -621,10 +842,10 @@ uint64_t bt_field_string_get_length(const struct bt_field *field)
 {
 	const struct bt_field_string *string_field = (const void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_SET(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING,
-		"Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET("field", field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field, "string-field",
+		BT_FIELD_CLASS_TYPE_STRING, "Field");
 	return string_field->length;
 }
 
@@ -633,49 +854,52 @@ 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;
+	g_array_index(string_field->buf, char, 0) = '\0';
 	bt_field_set_single(field, true);
 }
 
 enum bt_field_string_set_value_status bt_field_string_set_value(
 		struct bt_field *field, const char *value)
 {
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_NON_NULL(value, "Value");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING,
-		"Field");
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_NON_NULL("value", value, "Value");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field, "string-field",
+		BT_FIELD_CLASS_TYPE_STRING, "Field");
 	clear_string_field(field);
 	return (int) bt_field_string_append_with_length(field, value,
 		(uint64_t) strlen(value));
 }
 
-enum bt_field_string_append_status bt_field_string_append(
-		struct bt_field *field, const char *value)
-{
-	return bt_field_string_append_with_length(field,
-		value, (uint64_t) strlen(value));
-}
+#define BT_ASSERT_PRE_DEV_FOR_APPEND_TO_STRING_FIELD_WITH_LENGTH(_field, _value, _length) \
+	do {								\
+		BT_ASSERT_PRE_DEV_NO_ERROR();				\
+		BT_ASSERT_PRE_DEV_FIELD_NON_NULL(_field);		\
+		BT_ASSERT_PRE_DEV_NON_NULL("value", (_value), "Value");	\
+		BT_ASSERT_PRE_DEV_FIELD_HOT(_field);			\
+		BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field",		\
+			(_field), "string-field",			\
+			BT_FIELD_CLASS_TYPE_STRING, "Field");		\
+		BT_ASSERT_PRE_DEV("value-has-no-null-byte",		\
+			!memchr((_value), '\0', (_length)),		\
+			"String value to append contains a null character: " \
+			"partial-value=\"%.32s\", length=%" PRIu64,	\
+			(_value), (_length));					\
+	} while (0)
 
-enum bt_field_string_append_status bt_field_string_append_with_length(
+static
+enum bt_field_string_append_status append_to_string_field_with_length(
 		struct bt_field *field, const char *value, uint64_t length)
 {
 	struct bt_field_string *string_field = (void *) field;
 	char *data;
 	uint64_t new_length;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_NON_NULL(value, "Value");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_STRING, "Field");
-
-	/* Make sure no null bytes are appended */
-	BT_ASSERT_PRE(memchr(value, '\0', length) == NULL,
-		"String value to append contains a null character: "
-		"partial-value=\"%.32s\", length=%" PRIu64, value, length);
-
+	BT_ASSERT_DBG(field);
+	BT_ASSERT_DBG(value);
 	new_length = length + string_field->length;
 
 	if (G_UNLIKELY(new_length + 1 > string_field->buf->len)) {
@@ -690,11 +914,29 @@ enum bt_field_string_append_status bt_field_string_append_with_length(
 	return BT_FUNC_STATUS_OK;
 }
 
+enum bt_field_string_append_status bt_field_string_append_with_length(
+		struct bt_field *field, const char *value, uint64_t length)
+{
+	BT_ASSERT_PRE_DEV_FOR_APPEND_TO_STRING_FIELD_WITH_LENGTH(field, value,
+		length);
+	return append_to_string_field_with_length(field, value, length);
+}
+
+enum bt_field_string_append_status bt_field_string_append(
+		struct bt_field *field, const char *value)
+{
+	uint64_t length = (uint64_t) strlen(value);
+
+	BT_ASSERT_PRE_DEV_FOR_APPEND_TO_STRING_FIELD_WITH_LENGTH(field, value,
+		length);
+	return append_to_string_field_with_length(field, value, length);
+}
+
 void bt_field_string_clear(struct bt_field *field)
 {
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field, "string-field",
 		BT_FIELD_CLASS_TYPE_STRING, "Field");
 	clear_string_field(field);
 }
@@ -703,21 +945,21 @@ uint64_t bt_field_array_get_length(const struct bt_field *field)
 {
 	const struct bt_field_array *array_field = (const void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_ARRAY(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_ARRAY("field", field, "Field");
 	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;
 	struct bt_field_array *array_field = (void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_DYNAMIC_ARRAY("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
 
 	if (G_UNLIKELY(length > array_field->fields->len)) {
 		/* Make more room */
@@ -742,7 +984,7 @@ enum bt_field_dynamic_array_set_length_status bt_field_dynamic_array_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;
 		}
 	}
@@ -755,39 +997,45 @@ end:
 
 static inline
 struct bt_field *borrow_array_field_element_field_by_index(
-		struct bt_field *field, uint64_t index)
+		struct bt_field *field, uint64_t index, const char *api_func)
 {
 	struct bt_field_array *array_field = (void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_IS_ARRAY(field, "Field");
-	BT_ASSERT_PRE_VALID_INDEX(index, array_field->length);
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL_FROM_FUNC(api_func, field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_ARRAY_FROM_FUNC(api_func, "field", field,
+		"Field");
+	BT_ASSERT_PRE_DEV_VALID_INDEX_FROM_FUNC(api_func, index,
+		array_field->length);
 	return array_field->fields->pdata[index];
 }
 
 struct bt_field *bt_field_array_borrow_element_field_by_index(
 		struct bt_field *field, uint64_t index)
 {
-	return borrow_array_field_element_field_by_index(field, index);
+	return borrow_array_field_element_field_by_index(field, index,
+		__func__);
 }
 
 const struct bt_field *
 bt_field_array_borrow_element_field_by_index_const(
 		const struct bt_field *field, uint64_t index)
 {
-	return borrow_array_field_element_field_by_index((void *) field, index);
+	return borrow_array_field_element_field_by_index((void *) field, index,
+		__func__);
 }
 
 static inline
 struct bt_field *borrow_structure_field_member_field_by_index(
-		struct bt_field *field, uint64_t index)
+		struct bt_field *field, uint64_t index, const char *api_func)
 {
 	struct bt_field_structure *struct_field = (void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_STRUCTURE, "Field");
-	BT_ASSERT_PRE_VALID_INDEX(index, struct_field->fields->len);
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL_FROM_FUNC(api_func, field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE_FROM_FUNC(api_func, "field",
+		field, "structure-field", BT_FIELD_CLASS_TYPE_STRUCTURE,
+		"Field");
+	BT_ASSERT_PRE_DEV_VALID_INDEX_FROM_FUNC(api_func, index,
+		struct_field->fields->len);
 	return struct_field->fields->pdata[index];
 }
 
@@ -795,7 +1043,7 @@ struct bt_field *bt_field_structure_borrow_member_field_by_index(
 		struct bt_field *field, uint64_t index)
 {
 	return borrow_structure_field_member_field_by_index(field,
-		index);
+		index, __func__);
 }
 
 const struct bt_field *
@@ -803,12 +1051,12 @@ bt_field_structure_borrow_member_field_by_index_const(
 		const struct bt_field *field, uint64_t index)
 {
 	return borrow_structure_field_member_field_by_index(
-		(void *) field, index);
+		(void *) field, index, __func__);
 }
 
 static inline
 struct bt_field *borrow_structure_field_member_field_by_name(
-		struct bt_field *field, const char *name)
+		struct bt_field *field, const char *name, const char *api_func)
 {
 	struct bt_field *ret_field = NULL;
 	struct bt_field_class_structure *struct_fc;
@@ -816,10 +1064,12 @@ struct bt_field *borrow_structure_field_member_field_by_name(
 	gpointer orig_key;
 	gpointer index;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_NON_NULL(name, "Field name");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_STRUCTURE, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL_FROM_FUNC(api_func, field);
+	BT_ASSERT_PRE_DEV_NON_NULL_FROM_FUNC(api_func, "member-name", name,
+		"Member name");
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE_FROM_FUNC(api_func, "field",
+		field, "structure-field", BT_FIELD_CLASS_TYPE_STRUCTURE,
+		"Field");
 	struct_fc = (void *) field->class;
 
 	if (!g_hash_table_lookup_extended(struct_fc->common.name_to_index, name,
@@ -828,7 +1078,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;
@@ -837,67 +1087,164 @@ end:
 struct bt_field *bt_field_structure_borrow_member_field_by_name(
 		struct bt_field *field, const char *name)
 {
-	return borrow_structure_field_member_field_by_name(field, name);
+	return borrow_structure_field_member_field_by_name(field, name,
+		__func__);
 }
 
 const struct bt_field *bt_field_structure_borrow_member_field_by_name_const(
 		const struct bt_field *field, const char *name)
 {
 	return borrow_structure_field_member_field_by_name(
-		(void *) field, name);
+		(void *) field, name, __func__);
 }
 
+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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_OPTION("field", 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);
+}
+
+#define BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_OPT_FIELD(_field)	\
+	do {								\
+		struct bt_field_variant *_var_field = (void *) field;	\
+		BT_ASSERT_PRE_DEV_FIELD_NON_NULL(_field);		\
+		BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT("field", (_field),	\
+			"Field");					\
+		BT_ASSERT_PRE_DEV("has-selected-field",			\
+			_var_field->selected_field,			\
+			"Variant field has no selected field: %!+f",	\
+			field);						\
+	} while (0)
+
 static inline
 struct bt_field *borrow_variant_field_selected_option_field(
 		struct bt_field *field)
 {
 	struct bt_field_variant *var_field = (void *) field;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_VARIANT, "Field");
-	BT_ASSERT_PRE(var_field->selected_field,
-		"Variant field has no selected field: %!+f", field);
+	BT_ASSERT_DBG(field);
 	return var_field->selected_field;
 }
 
 struct bt_field *bt_field_variant_borrow_selected_option_field(
 		struct bt_field *field)
 {
+	BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_OPT_FIELD(field);
 	return borrow_variant_field_selected_option_field(field);
 }
 
 const struct bt_field *bt_field_variant_borrow_selected_option_field_const(
 		const struct bt_field *field)
 {
+	BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_OPT_FIELD(field);
 	return borrow_variant_field_selected_option_field((void *) field);
 }
 
-enum bt_field_variant_select_option_field_status
-bt_field_variant_select_option_field(
+#define BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_CLASS_OPT(_field)	\
+	do {								\
+		struct bt_field_variant *_var_field = (void *) field;	\
+		BT_ASSERT_PRE_DEV("has-selected-field",			\
+			_var_field->selected_field,			\
+			"Variant field has no selected field: %!+f",	\
+			(_field));					\
+	} while (0)
+
+static
+const struct bt_field_class_variant_option *
+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_DBG(field);
+	container_fc = (const void *) field->class;
+	return container_fc->named_fcs->pdata[var_field->selected_index];
+}
+
+const struct bt_field_class_variant_option *
+bt_field_variant_borrow_selected_option_class_const(
+		const struct bt_field *field)
+{
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_CLASS_OPT(field);
+	return borrow_variant_field_selected_class_option(field);
+}
+
+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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"variant-field-with-unsigned-selector-field",
+		BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
+		"Field");
+	BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_CLASS_OPT(field);
+	return (const void *) borrow_variant_field_selected_class_option(field);
+}
+
+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_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE("field", field,
+		"variant-field-with-signed-selector-field",
+		BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
+		"Field");
+	BT_ASSERT_PRE_DEV_FOR_BORROW_VAR_FIELD_SEL_CLASS_OPT(field);
+	return (const void *) borrow_variant_field_selected_class_option(field);
+}
+
+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_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_VARIANT, "Field");
-	BT_ASSERT_PRE_FIELD_HOT(field, "Field");
-	BT_ASSERT_PRE_VALID_INDEX(index, var_field->fields->len);
+	BT_ASSERT_PRE_DEV_NO_ERROR();
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT("field", field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field);
+	BT_ASSERT_PRE_DEV_VALID_INDEX(index, var_field->fields->len);
 	var_field->selected_field = var_field->fields->pdata[index];
 	var_field->selected_index = 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;
 
-	BT_ASSERT_PRE_NON_NULL(field, "Field");
-	BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field,
-		BT_FIELD_CLASS_TYPE_VARIANT, "Field");
-	BT_ASSERT_PRE(var_field->selected_field,
+	BT_ASSERT_PRE_DEV_FIELD_NON_NULL(field);
+	BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT("field", field, "Field");
+	BT_ASSERT_PRE_DEV("has-selected-field", var_field->selected_field,
 		"Variant field has no selected field: %!+f", field);
 	return var_field->selected_index;
 }
@@ -910,6 +1257,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)
 {
@@ -945,6 +1310,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)
 {
@@ -1000,14 +1381,55 @@ BT_HIDDEN
 void bt_field_destroy(struct bt_field *field)
 {
 	BT_ASSERT(field);
-	BT_ASSERT(bt_field_class_has_known_type(field->class));
-	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;
 }
 
@@ -1017,20 +1439,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]);
@@ -1043,7 +1475,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]);
@@ -1071,12 +1503,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)
 {
@@ -1092,7 +1535,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);
@@ -1113,7 +1556,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);
@@ -1123,17 +1566,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;
 }
 
@@ -1144,7 +1587,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]);
@@ -1157,13 +1600,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);
@@ -1179,7 +1637,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]);