X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fvalues.c;h=ffe289c2bdeec5d44e3466619ebfbf0090866e60;hb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;hp=1c7902bd73ea10b6c688841ad7dd08f635f20dde;hpb=f685129c346e580bfaa4f555c4c80b9b63e490ea;p=babeltrace.git

diff --git a/lib/values.c b/lib/values.c
index 1c7902bd..ffe289c2 100644
--- a/lib/values.c
+++ b/lib/values.c
@@ -1,8 +1,4 @@
 /*
- * Values.c: value objects
- *
- * Babeltrace Library
- *
  * Copyright (c) 2015 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2015 Philippe Proulx <pproulx@efficios.com>
  *
@@ -25,49 +21,81 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "VALUES"
+#include <babeltrace/lib-logging-internal.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <string.h>
-#include <babeltrace/compiler.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/ref.h>
+#include <inttypes.h>
+#include <babeltrace/compiler-internal.h>
+#include <babeltrace/common-internal.h>
+#include <babeltrace/object.h>
 #include <babeltrace/values.h>
-#include <babeltrace/compat/glib.h>
+#include <babeltrace/private-values.h>
+#include <babeltrace/compat/glib-internal.h>
+#include <babeltrace/types.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/values-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
 
 #define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete))
 #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base))
 #define BT_VALUE_TO_INTEGER(_base) ((struct bt_value_integer *) (_base))
-#define BT_VALUE_TO_FLOAT(_base) ((struct bt_value_float *) (_base))
+#define BT_VALUE_TO_REAL(_base) ((struct bt_value_real *) (_base))
 #define BT_VALUE_TO_STRING(_base) ((struct bt_value_string *) (_base))
 #define BT_VALUE_TO_ARRAY(_base) ((struct bt_value_array *) (_base))
 #define BT_VALUE_TO_MAP(_base) ((struct bt_value_map *) (_base))
 
+#define BT_ASSERT_PRE_VALUE_IS_TYPE(_value, _type)			\
+	BT_ASSERT_PRE(((struct bt_value *) (_value))->type == (_type),	\
+		"Value has the wrong type ID: expected-type=%s, "	\
+		"%![value-]+v", bt_common_value_type_string(_type),	\
+		(_value))
+
+#define BT_ASSERT_PRE_VALUE_HOT(_value, _name)				\
+	BT_ASSERT_PRE_HOT(((struct bt_value *) (_value)), (_name),	\
+		": %!+v", (_value))
+
+#define BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(_index, _count)		\
+	BT_ASSERT_PRE((_index) < (_count),				\
+		"Index is out of bound: "				\
+		"index=%" PRIu64 ", count=%u", (_index), (_count));
+
 struct bt_value {
 	struct bt_object base;
 	enum bt_value_type type;
-	bool is_frozen;
+	bt_bool frozen;
 };
 
+static
+void bt_value_null_instance_release_func(struct bt_object *obj)
+{
+	BT_LOGW("Releasing the null value singleton: addr=%p", obj);
+}
+
 static
 struct bt_value bt_value_null_instance = {
 	.base = {
-		.ref_count = {
-			.count = 1,
-			.release = NULL,
-		},
-		.release = NULL,
+		.is_shared = true,
+		.ref_count = 1,
+		.release_func = bt_value_null_instance_release_func,
+		.spec_release_func = NULL,
+		.parent_is_owner_listener_func = NULL,
 		.parent = NULL,
 	},
 	.type = BT_VALUE_TYPE_NULL,
-	.is_frozen = true,
+	.frozen = BT_TRUE,
 };
 
 struct bt_value *bt_value_null = &bt_value_null_instance;
+struct bt_private_value *bt_private_value_null =
+	(void *) &bt_value_null_instance;
 
 struct bt_value_bool {
 	struct bt_value base;
-	bool value;
+	bt_bool value;
 };
 
 struct bt_value_integer {
@@ -75,7 +103,7 @@ struct bt_value_integer {
 	int64_t value;
 };
 
-struct bt_value_float {
+struct bt_value_real {
 	struct bt_value base;
 	double value;
 };
@@ -102,6 +130,7 @@ static
 void bt_value_string_destroy(struct bt_value *object)
 {
 	g_string_free(BT_VALUE_TO_STRING(object)->gstr, TRUE);
+	BT_VALUE_TO_STRING(object)->gstr = NULL;
 }
 
 static
@@ -112,6 +141,7 @@ void bt_value_array_destroy(struct bt_value *object)
 	 * of putting each contained object.
 	 */
 	g_ptr_array_free(BT_VALUE_TO_ARRAY(object)->garray, TRUE);
+	BT_VALUE_TO_ARRAY(object)->garray = NULL;
 }
 
 static
@@ -123,6 +153,7 @@ void bt_value_map_destroy(struct bt_value *object)
 	 * be destroyed anyway.
 	 */
 	g_hash_table_destroy(BT_VALUE_TO_MAP(object)->ght);
+	BT_VALUE_TO_MAP(object)->ght = NULL;
 }
 
 static
@@ -130,103 +161,113 @@ void (* const destroy_funcs[])(struct bt_value *) = {
 	[BT_VALUE_TYPE_NULL] =		NULL,
 	[BT_VALUE_TYPE_BOOL] =		NULL,
 	[BT_VALUE_TYPE_INTEGER] =	NULL,
-	[BT_VALUE_TYPE_FLOAT] =		NULL,
+	[BT_VALUE_TYPE_REAL] =		NULL,
 	[BT_VALUE_TYPE_STRING] =	bt_value_string_destroy,
 	[BT_VALUE_TYPE_ARRAY] =		bt_value_array_destroy,
 	[BT_VALUE_TYPE_MAP] =		bt_value_map_destroy,
 };
 
 static
-struct bt_value *bt_value_null_copy(const struct bt_value *null_obj)
+struct bt_private_value *bt_value_null_copy(const struct bt_value *null_obj)
 {
-	return bt_value_null;
+	return (void *) bt_value_null;
 }
 
 static
-struct bt_value *bt_value_bool_copy(const struct bt_value *bool_obj)
+struct bt_private_value *bt_value_bool_copy(const struct bt_value *bool_obj)
 {
-	return bt_value_bool_create_init(BT_VALUE_TO_BOOL(bool_obj)->value);
+	return bt_private_value_bool_create_init(
+		BT_VALUE_TO_BOOL(bool_obj)->value);
 }
 
 static
-struct bt_value *bt_value_integer_copy(const struct bt_value *integer_obj)
+struct bt_private_value *bt_value_integer_copy(
+		const struct bt_value *integer_obj)
 {
-	return bt_value_integer_create_init(
+	return bt_private_value_integer_create_init(
 		BT_VALUE_TO_INTEGER(integer_obj)->value);
 }
 
 static
-struct bt_value *bt_value_float_copy(const struct bt_value *float_obj)
+struct bt_private_value *bt_value_real_copy(const struct bt_value *real_obj)
 {
-	return bt_value_float_create_init(
-		BT_VALUE_TO_FLOAT(float_obj)->value);
+	return bt_private_value_real_create_init(
+		BT_VALUE_TO_REAL(real_obj)->value);
 }
 
 static
-struct bt_value *bt_value_string_copy(const struct bt_value *string_obj)
+struct bt_private_value *bt_value_string_copy(const struct bt_value *string_obj)
 {
-	return bt_value_string_create_init(
+	return bt_private_value_string_create_init(
 		BT_VALUE_TO_STRING(string_obj)->gstr->str);
 }
 
 static
-struct bt_value *bt_value_array_copy(const struct bt_value *array_obj)
+struct bt_private_value *bt_value_array_copy(const struct bt_value *array_obj)
 {
 	int i;
 	int ret;
-	struct bt_value *copy_obj;
+	struct bt_private_value *copy_obj;
 	struct bt_value_array *typed_array_obj;
 
+	BT_LOGD("Copying array value: addr=%p", array_obj);
 	typed_array_obj = BT_VALUE_TO_ARRAY(array_obj);
-	copy_obj = bt_value_array_create();
-
+	copy_obj = bt_private_value_array_create();
 	if (!copy_obj) {
+		BT_LOGE_STR("Cannot create empty array value.");
 		goto end;
 	}
 
 	for (i = 0; i < typed_array_obj->garray->len; ++i) {
-		struct bt_value *element_obj_copy;
-		struct bt_value *element_obj = bt_value_array_get(array_obj, i);
-
-		if (!element_obj) {
-			BT_PUT(copy_obj);
-			goto end;
-		}
-
-		element_obj_copy = bt_value_copy(element_obj);
-		BT_PUT(element_obj);
+		struct bt_private_value *element_obj_copy = NULL;
+		struct bt_value *element_obj =
+			bt_value_array_borrow_element_by_index(
+				array_obj, i);
 
-		if (!element_obj_copy) {
-			BT_PUT(copy_obj);
+		BT_ASSERT(element_obj);
+		BT_LOGD("Copying array value's element: element-addr=%p, "
+			"index=%d", element_obj, i);
+		ret = bt_value_copy(&element_obj_copy, element_obj);
+		if (ret) {
+			BT_LOGE("Cannot copy array value's element: "
+				"array-addr=%p, index=%d",
+				array_obj, i);
+			BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
 			goto end;
 		}
 
-		ret = bt_value_array_append(copy_obj, element_obj_copy);
-		BT_PUT(element_obj_copy);
-
+		BT_ASSERT(element_obj_copy);
+		ret = bt_private_value_array_append_element(copy_obj,
+			(void *) element_obj_copy);
+		BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
 		if (ret) {
-			BT_PUT(copy_obj);
+			BT_LOGE("Cannot append to array value: addr=%p",
+				array_obj);
+			BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
 			goto end;
 		}
 	}
 
+	BT_LOGD("Copied array value: original-addr=%p, copy-addr=%p",
+		array_obj, copy_obj);
+
 end:
 	return copy_obj;
 }
 
 static
-struct bt_value *bt_value_map_copy(const struct bt_value *map_obj)
+struct bt_private_value *bt_value_map_copy(const struct bt_value *map_obj)
 {
 	int ret;
 	GHashTableIter iter;
 	gpointer key, element_obj;
-	struct bt_value *copy_obj;
-	struct bt_value *element_obj_copy;
+	struct bt_private_value *copy_obj;
+	struct bt_private_value *element_obj_copy = NULL;
 	struct bt_value_map *typed_map_obj;
 
+	BT_LOGD("Copying map value: addr=%p", map_obj);
 	typed_map_obj = BT_VALUE_TO_MAP(map_obj);
-	copy_obj = bt_value_map_create();
-
+	copy_obj = bt_private_value_map_create();
 	if (!copy_obj) {
 		goto end;
 	}
@@ -236,92 +277,141 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj)
 	while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
 		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
-		element_obj_copy = bt_value_copy(element_obj);
-
-		if (!element_obj_copy) {
-			BT_PUT(copy_obj);
+		BT_ASSERT(key_str);
+		BT_LOGD("Copying map value's element: element-addr=%p, "
+			"key=\"%s\"", element_obj, key_str);
+		ret = bt_value_copy(&element_obj_copy, element_obj);
+		if (ret) {
+			BT_LOGE("Cannot copy map value's element: "
+				"map-addr=%p, key=\"%s\"",
+				map_obj, key_str);
+			BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
 			goto end;
 		}
 
-		ret = bt_value_map_insert(copy_obj, key_str, element_obj_copy);
-		BT_PUT(element_obj_copy);
-
+		BT_ASSERT(element_obj_copy);
+		ret = bt_private_value_map_insert_entry(copy_obj, key_str,
+			(void *) element_obj_copy);
+		BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
 		if (ret) {
-			BT_PUT(copy_obj);
+			BT_LOGE("Cannot insert into map value: addr=%p, key=\"%s\"",
+				map_obj, key_str);
+			BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
 			goto end;
 		}
 	}
 
+	BT_LOGD("Copied map value: addr=%p", map_obj);
+
 end:
 	return copy_obj;
 }
 
 static
-struct bt_value *(* const copy_funcs[])(const struct bt_value *) = {
+struct bt_private_value *(* const copy_funcs[])(const struct bt_value *) = {
 	[BT_VALUE_TYPE_NULL] =		bt_value_null_copy,
 	[BT_VALUE_TYPE_BOOL] =		bt_value_bool_copy,
 	[BT_VALUE_TYPE_INTEGER] =	bt_value_integer_copy,
-	[BT_VALUE_TYPE_FLOAT] =		bt_value_float_copy,
+	[BT_VALUE_TYPE_REAL] =		bt_value_real_copy,
 	[BT_VALUE_TYPE_STRING] =	bt_value_string_copy,
 	[BT_VALUE_TYPE_ARRAY] =		bt_value_array_copy,
 	[BT_VALUE_TYPE_MAP] =		bt_value_map_copy,
 };
 
 static
-bool bt_value_null_compare(const struct bt_value *object_a,
+bt_bool bt_value_null_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
 	/*
-	 * Always true since bt_value_compare() already checks if both
+	 * Always BT_TRUE since bt_value_compare() already checks if both
 	 * object_a and object_b have the same type, and in the case of
 	 * null value objects, they're always the same if it is so.
 	 */
-	return true;
+	return BT_TRUE;
 }
 
 static
-bool bt_value_bool_compare(const struct bt_value *object_a,
+bt_bool bt_value_bool_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
-	return BT_VALUE_TO_BOOL(object_a)->value ==
-		BT_VALUE_TO_BOOL(object_b)->value;
+	if (BT_VALUE_TO_BOOL(object_a)->value !=
+			BT_VALUE_TO_BOOL(object_b)->value) {
+		BT_LOGV("Boolean value objects are different: "
+			"bool-a-val=%d, bool-b-val=%d",
+			BT_VALUE_TO_BOOL(object_a)->value,
+			BT_VALUE_TO_BOOL(object_b)->value);
+		return BT_FALSE;
+	}
+
+	return BT_TRUE;
 }
 
 static
-bool bt_value_integer_compare(const struct bt_value *object_a,
+bt_bool bt_value_integer_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
-	return BT_VALUE_TO_INTEGER(object_a)->value ==
-		BT_VALUE_TO_INTEGER(object_b)->value;
+	if (BT_VALUE_TO_INTEGER(object_a)->value !=
+			BT_VALUE_TO_INTEGER(object_b)->value) {
+		BT_LOGV("Integer value objects are different: "
+			"int-a-val=%" PRId64 ", int-b-val=%" PRId64,
+			BT_VALUE_TO_INTEGER(object_a)->value,
+			BT_VALUE_TO_INTEGER(object_b)->value);
+		return BT_FALSE;
+	}
+
+	return BT_TRUE;
 }
 
 static
-bool bt_value_float_compare(const struct bt_value *object_a,
+bt_bool bt_value_real_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
-	return BT_VALUE_TO_FLOAT(object_a)->value ==
-		BT_VALUE_TO_FLOAT(object_b)->value;
+	if (BT_VALUE_TO_REAL(object_a)->value !=
+			BT_VALUE_TO_REAL(object_b)->value) {
+		BT_LOGV("Real number value objects are different: "
+			"real-a-val=%f, real-b-val=%f",
+			BT_VALUE_TO_REAL(object_a)->value,
+			BT_VALUE_TO_REAL(object_b)->value);
+		return BT_FALSE;
+	}
+
+	return BT_TRUE;
 }
 
 static
-bool bt_value_string_compare(const struct bt_value *object_a,
+bt_bool bt_value_string_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
-	return !strcmp(BT_VALUE_TO_STRING(object_a)->gstr->str,
-		BT_VALUE_TO_STRING(object_b)->gstr->str);
+	if (strcmp(BT_VALUE_TO_STRING(object_a)->gstr->str,
+			BT_VALUE_TO_STRING(object_b)->gstr->str) != 0) {
+		BT_LOGV("String value objects are different: "
+			"string-a-val=\"%s\", string-b-val=\"%s\"",
+			BT_VALUE_TO_STRING(object_a)->gstr->str,
+			BT_VALUE_TO_STRING(object_b)->gstr->str);
+		return BT_FALSE;
+	}
+
+	return BT_TRUE;
 }
 
 static
-bool bt_value_array_compare(const struct bt_value *object_a,
+bt_bool bt_value_array_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
 	int i;
-	bool ret = true;
+	bt_bool ret = BT_TRUE;
 	const struct bt_value_array *array_obj_a =
 		BT_VALUE_TO_ARRAY(object_a);
 
-	if (bt_value_array_size(object_a) != bt_value_array_size(object_b)) {
-		ret = false;
+	if (bt_value_array_get_size(object_a) !=
+			bt_value_array_get_size(object_b)) {
+		BT_LOGV("Array values are different: size mismatch "
+			"value-a-addr=%p, value-b-addr=%p, "
+			"value-a-size=%" PRId64 ", value-b-size=%" PRId64,
+			object_a, object_b,
+			bt_value_array_get_size(object_a),
+			bt_value_array_get_size(object_b));
+		ret = BT_FALSE;
 		goto end;
 	}
 
@@ -329,18 +419,18 @@ bool bt_value_array_compare(const struct bt_value *object_a,
 		struct bt_value *element_obj_a;
 		struct bt_value *element_obj_b;
 
-		element_obj_a = bt_value_array_get(object_a, i);
-		element_obj_b = bt_value_array_get(object_b, i);
+		element_obj_a = bt_value_array_borrow_element_by_index(
+			object_a, i);
+		element_obj_b = bt_value_array_borrow_element_by_index(
+			object_b, i);
 
 		if (!bt_value_compare(element_obj_a, element_obj_b)) {
-			BT_PUT(element_obj_a);
-			BT_PUT(element_obj_b);
-			ret = false;
+			BT_LOGV("Array values's elements are different: "
+				"value-a-addr=%p, value-b-addr=%p, index=%d",
+				element_obj_a, element_obj_b, i);
+			ret = BT_FALSE;
 			goto end;
 		}
-
-		BT_PUT(element_obj_a);
-		BT_PUT(element_obj_b);
 	}
 
 end:
@@ -348,16 +438,23 @@ end:
 }
 
 static
-bool bt_value_map_compare(const struct bt_value *object_a,
+bt_bool bt_value_map_compare(const struct bt_value *object_a,
 		const struct bt_value *object_b)
 {
-	bool ret = true;
+	bt_bool ret = BT_TRUE;
 	GHashTableIter iter;
 	gpointer key, element_obj_a;
 	const struct bt_value_map *map_obj_a = BT_VALUE_TO_MAP(object_a);
 
-	if (bt_value_map_size(object_a) != bt_value_map_size(object_b)) {
-		ret = false;
+	if (bt_value_map_get_size(object_a) !=
+			bt_value_map_get_size(object_b)) {
+		BT_LOGV("Map values are different: size mismatch "
+			"value-a-addr=%p, value-b-addr=%p, "
+			"value-a-size=%" PRId64 ", value-b-size=%" PRId64,
+			object_a, object_b,
+			bt_value_map_get_size(object_a),
+			bt_value_map_get_size(object_b));
+		ret = BT_FALSE;
 		goto end;
 	}
 
@@ -367,15 +464,16 @@ bool bt_value_map_compare(const struct bt_value *object_a,
 		struct bt_value *element_obj_b;
 		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
-		element_obj_b = bt_value_map_get(object_b, key_str);
+		element_obj_b = bt_value_map_borrow_entry_value(object_b,
+			key_str);
 
 		if (!bt_value_compare(element_obj_a, element_obj_b)) {
-			BT_PUT(element_obj_b);
-			ret = false;
+			BT_LOGV("Map values's elements are different: "
+				"value-a-addr=%p, value-b-addr=%p, key=\"%s\"",
+				element_obj_a, element_obj_b, key_str);
+			ret = BT_FALSE;
 			goto end;
 		}
-
-		BT_PUT(element_obj_b);
 	}
 
 end:
@@ -383,26 +481,29 @@ end:
 }
 
 static
-bool (* const compare_funcs[])(const struct bt_value *,
+bt_bool (* const compare_funcs[])(const struct bt_value *,
 		const struct bt_value *) = {
 	[BT_VALUE_TYPE_NULL] =		bt_value_null_compare,
 	[BT_VALUE_TYPE_BOOL] =		bt_value_bool_compare,
 	[BT_VALUE_TYPE_INTEGER] =	bt_value_integer_compare,
-	[BT_VALUE_TYPE_FLOAT] =	bt_value_float_compare,
+	[BT_VALUE_TYPE_REAL] =		bt_value_real_compare,
 	[BT_VALUE_TYPE_STRING] =	bt_value_string_compare,
-	[BT_VALUE_TYPE_ARRAY] =	bt_value_array_compare,
+	[BT_VALUE_TYPE_ARRAY] =		bt_value_array_compare,
 	[BT_VALUE_TYPE_MAP] =		bt_value_map_compare,
 };
 
+static
 void bt_value_null_freeze(struct bt_value *object)
 {
 }
 
+static
 void bt_value_generic_freeze(struct bt_value *object)
 {
-	object->is_frozen = true;
+	object->frozen = BT_TRUE;
 }
 
+static
 void bt_value_array_freeze(struct bt_value *object)
 {
 	int i;
@@ -410,15 +511,13 @@ void bt_value_array_freeze(struct bt_value *object)
 		BT_VALUE_TO_ARRAY(object);
 
 	for (i = 0; i < typed_array_obj->garray->len; ++i) {
-		struct bt_value *element_obj =
-			g_ptr_array_index(typed_array_obj->garray, i);
-
-		bt_value_freeze(element_obj);
+		bt_value_freeze(g_ptr_array_index(typed_array_obj->garray, i));
 	}
 
 	bt_value_generic_freeze(object);
 }
 
+static
 void bt_value_map_freeze(struct bt_value *object)
 {
 	GHashTableIter iter;
@@ -439,7 +538,7 @@ void (* const freeze_funcs[])(struct bt_value *) = {
 	[BT_VALUE_TYPE_NULL] =		bt_value_null_freeze,
 	[BT_VALUE_TYPE_BOOL] =		bt_value_generic_freeze,
 	[BT_VALUE_TYPE_INTEGER] =	bt_value_generic_freeze,
-	[BT_VALUE_TYPE_FLOAT] =		bt_value_generic_freeze,
+	[BT_VALUE_TYPE_REAL] =		bt_value_generic_freeze,
 	[BT_VALUE_TYPE_STRING] =	bt_value_generic_freeze,
 	[BT_VALUE_TYPE_ARRAY] =		bt_value_array_freeze,
 	[BT_VALUE_TYPE_MAP] =		bt_value_map_freeze,
@@ -451,9 +550,10 @@ void bt_value_destroy(struct bt_object *obj)
 	struct bt_value *value;
 
 	value = container_of(obj, struct bt_value, base);
-	assert(value->type != BT_VALUE_TYPE_UNKNOWN);
+	BT_LOGD("Destroying value: addr=%p", value);
 
 	if (bt_value_is_null(value)) {
+		BT_LOGD_STR("Not destroying the null value singleton.");
 		return;
 	}
 
@@ -464,817 +564,736 @@ void bt_value_destroy(struct bt_object *obj)
 	g_free(value);
 }
 
-enum bt_value_status bt_value_freeze(struct bt_value *object)
+BT_HIDDEN
+enum bt_value_status _bt_value_freeze(struct bt_value *object)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 
-	if (!object) {
-		ret = BT_VALUE_STATUS_INVAL;
+	BT_ASSERT(object);
+
+	if (object->frozen) {
 		goto end;
 	}
 
+	BT_LOGD("Freezing value: addr=%p", object);
 	freeze_funcs[object->type](object);
 
 end:
 	return ret;
 }
 
-bool bt_value_is_frozen(const struct bt_value *object)
-{
-	return object && object->is_frozen;
-}
-
 enum bt_value_type bt_value_get_type(const struct bt_value *object)
 {
-	if (!object) {
-		return BT_VALUE_TYPE_UNKNOWN;
-	}
-
+	BT_ASSERT_PRE_NON_NULL(object, "Value object");
 	return object->type;
 }
 
 static
 struct bt_value bt_value_create_base(enum bt_value_type type)
 {
-	struct bt_value base;
-
-	base.type = type;
-	base.is_frozen = false;
-	bt_object_init(&base, bt_value_destroy);
+	struct bt_value value;
 
-	return base;
+	value.type = type;
+	value.frozen = BT_FALSE;
+	bt_object_init_shared(&value.base, bt_value_destroy);
+	return value;
 }
 
-struct bt_value *bt_value_bool_create_init(bool val)
+struct bt_private_value *bt_private_value_bool_create_init(bt_bool val)
 {
 	struct bt_value_bool *bool_obj;
 
+	BT_LOGD("Creating boolean value object: val=%d", val);
 	bool_obj = g_new0(struct bt_value_bool, 1);
-
 	if (!bool_obj) {
+		BT_LOGE_STR("Failed to allocate one boolean value object.");
 		goto end;
 	}
 
 	bool_obj->base = bt_value_create_base(BT_VALUE_TYPE_BOOL);
 	bool_obj->value = val;
+	BT_LOGD("Created boolean value object: addr=%p", bool_obj);
 
 end:
-	return BT_VALUE_FROM_CONCRETE(bool_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(bool_obj);
 }
 
-struct bt_value *bt_value_bool_create(void)
+struct bt_private_value *bt_private_value_bool_create(void)
 {
-	return bt_value_bool_create_init(false);
+	return bt_private_value_bool_create_init(BT_FALSE);
 }
 
-struct bt_value *bt_value_integer_create_init(int64_t val)
+struct bt_private_value *bt_private_value_integer_create_init(int64_t val)
 {
 	struct bt_value_integer *integer_obj;
 
+	BT_LOGD("Creating integer value object: val=%" PRId64, val);
 	integer_obj = g_new0(struct bt_value_integer, 1);
-
 	if (!integer_obj) {
+		BT_LOGE_STR("Failed to allocate one integer value object.");
 		goto end;
 	}
 
 	integer_obj->base = bt_value_create_base(BT_VALUE_TYPE_INTEGER);
 	integer_obj->value = val;
+	BT_LOGD("Created integer value object: addr=%p",
+		integer_obj);
 
 end:
-	return BT_VALUE_FROM_CONCRETE(integer_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(integer_obj);
 }
 
-struct bt_value *bt_value_integer_create(void)
+struct bt_private_value *bt_private_value_integer_create(void)
 {
-	return bt_value_integer_create_init(0);
+	return bt_private_value_integer_create_init(0);
 }
 
-struct bt_value *bt_value_float_create_init(double val)
+struct bt_private_value *bt_private_value_real_create_init(double val)
 {
-	struct bt_value_float *float_obj;
+	struct bt_value_real *real_obj;
 
-	float_obj = g_new0(struct bt_value_float, 1);
-
-	if (!float_obj) {
+	BT_LOGD("Creating real number value object: val=%f", val);
+	real_obj = g_new0(struct bt_value_real, 1);
+	if (!real_obj) {
+		BT_LOGE_STR("Failed to allocate one real number value object.");
 		goto end;
 	}
 
-	float_obj->base = bt_value_create_base(BT_VALUE_TYPE_FLOAT);
-	float_obj->value = val;
+	real_obj->base = bt_value_create_base(BT_VALUE_TYPE_REAL);
+	real_obj->value = val;
+	BT_LOGD("Created real number value object: addr=%p",
+		real_obj);
 
 end:
-	return BT_VALUE_FROM_CONCRETE(float_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(real_obj);
 }
 
-struct bt_value *bt_value_float_create(void)
+struct bt_private_value *bt_private_value_real_create(void)
 {
-	return bt_value_float_create_init(0.);
+	return bt_private_value_real_create_init(0.);
 }
 
-struct bt_value *bt_value_string_create_init(const char *val)
+struct bt_private_value *bt_private_value_string_create_init(const char *val)
 {
 	struct bt_value_string *string_obj = NULL;
 
 	if (!val) {
+		BT_LOGW_STR("Invalid parameter: value is NULL.");
 		goto end;
 	}
 
+	BT_LOGD("Creating string value object: val-len=%zu", strlen(val));
 	string_obj = g_new0(struct bt_value_string, 1);
-
 	if (!string_obj) {
+		BT_LOGE_STR("Failed to allocate one string object.");
 		goto end;
 	}
 
 	string_obj->base = bt_value_create_base(BT_VALUE_TYPE_STRING);
 	string_obj->gstr = g_string_new(val);
-
 	if (!string_obj->gstr) {
+		BT_LOGE_STR("Failed to allocate a GString.");
 		g_free(string_obj);
 		string_obj = NULL;
 		goto end;
 	}
 
+	BT_LOGD("Created string value object: addr=%p",
+		string_obj);
+
 end:
-	return BT_VALUE_FROM_CONCRETE(string_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(string_obj);
 }
 
-struct bt_value *bt_value_string_create(void)
+struct bt_private_value *bt_private_value_string_create(void)
 {
-	return bt_value_string_create_init("");
+	return bt_private_value_string_create_init("");
 }
 
-struct bt_value *bt_value_array_create(void)
+struct bt_private_value *bt_private_value_array_create(void)
 {
 	struct bt_value_array *array_obj;
 
+	BT_LOGD_STR("Creating empty array value object.");
 	array_obj = g_new0(struct bt_value_array, 1);
-
 	if (!array_obj) {
+		BT_LOGE_STR("Failed to allocate one array object.");
 		goto end;
 	}
 
 	array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY);
 	array_obj->garray = bt_g_ptr_array_new_full(0,
-		(GDestroyNotify) bt_put);
-
+		(GDestroyNotify) bt_object_put_ref);
 	if (!array_obj->garray) {
+		BT_LOGE_STR("Failed to allocate a GPtrArray.");
 		g_free(array_obj);
 		array_obj = NULL;
 		goto end;
 	}
 
+	BT_LOGD("Created array value object: addr=%p",
+		array_obj);
+
 end:
-	return BT_VALUE_FROM_CONCRETE(array_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(array_obj);
 }
 
-struct bt_value *bt_value_map_create(void)
+struct bt_private_value *bt_private_value_map_create(void)
 {
 	struct bt_value_map *map_obj;
 
+	BT_LOGD_STR("Creating empty map value object.");
 	map_obj = g_new0(struct bt_value_map, 1);
-
 	if (!map_obj) {
+		BT_LOGE_STR("Failed to allocate one map object.");
 		goto end;
 	}
 
 	map_obj->base = bt_value_create_base(BT_VALUE_TYPE_MAP);
 	map_obj->ght = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-		NULL, (GDestroyNotify) bt_put);
-
+		NULL, (GDestroyNotify) bt_object_put_ref);
 	if (!map_obj->ght) {
+		BT_LOGE_STR("Failed to allocate a GHashTable.");
 		g_free(map_obj);
 		map_obj = NULL;
 		goto end;
 	}
 
+	BT_LOGD("Created map value object: addr=%p",
+		map_obj);
+
 end:
-	return BT_VALUE_FROM_CONCRETE(map_obj);
+	return (void *) BT_VALUE_FROM_CONCRETE(map_obj);
 }
 
-enum bt_value_status bt_value_bool_get(const struct bt_value *bool_obj,
-		bool *val)
+bt_bool bt_value_bool_get(const struct bt_value *bool_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_bool *typed_bool_obj = BT_VALUE_TO_BOOL(bool_obj);
-
-	if (!bool_obj || !bt_value_is_bool(bool_obj) || !val) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	*val = typed_bool_obj->value;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL);
+	return BT_VALUE_TO_BOOL(bool_obj)->value;
 }
 
-enum bt_value_status bt_value_bool_set(struct bt_value *bool_obj, bool val)
+void bt_private_value_bool_set(struct bt_private_value *bool_obj, bt_bool val)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_bool *typed_bool_obj = BT_VALUE_TO_BOOL(bool_obj);
-
-	if (!bool_obj || !bt_value_is_bool(bool_obj)) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (bool_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	typed_bool_obj->value = val;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL);
+	BT_ASSERT_PRE_VALUE_HOT(bool_obj, "Value object");
+	BT_VALUE_TO_BOOL(bool_obj)->value = val;
+	BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d",
+		bool_obj, val);
 }
 
-enum bt_value_status bt_value_integer_get(const struct bt_value *integer_obj,
-		int64_t *val)
+int64_t bt_value_integer_get(const struct bt_value *integer_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_integer *typed_integer_obj =
-		BT_VALUE_TO_INTEGER(integer_obj);
-
-	if (!integer_obj || !bt_value_is_integer(integer_obj) || !val) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	*val = typed_integer_obj->value;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_INTEGER);
+	return BT_VALUE_TO_INTEGER(integer_obj)->value;
 }
 
-enum bt_value_status bt_value_integer_set(struct bt_value *integer_obj,
+void bt_private_value_integer_set(struct bt_private_value *integer_obj,
 		int64_t val)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_integer *typed_integer_obj =
-		BT_VALUE_TO_INTEGER(integer_obj);
-
-	if (!integer_obj || !bt_value_is_integer(integer_obj)) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (integer_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	typed_integer_obj->value = val;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_INTEGER);
+	BT_ASSERT_PRE_VALUE_HOT(integer_obj, "Value object");
+	BT_VALUE_TO_INTEGER(integer_obj)->value = val;
+	BT_LOGV("Set integer value's raw value: value-addr=%p, value=%" PRId64,
+		integer_obj, val);
 }
 
-enum bt_value_status bt_value_float_get(const struct bt_value *float_obj,
-		double *val)
+double bt_value_real_get(const struct bt_value *real_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_float *typed_float_obj =
-		BT_VALUE_TO_FLOAT(float_obj);
-
-	if (!float_obj || !bt_value_is_float(float_obj) || !val) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	*val = typed_float_obj->value;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(real_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL);
+	return BT_VALUE_TO_REAL(real_obj)->value;
 }
 
-enum bt_value_status bt_value_float_set(struct bt_value *float_obj,
-		double val)
+void bt_private_value_real_set(struct bt_private_value *real_obj, double val)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_float *typed_float_obj =
-		BT_VALUE_TO_FLOAT(float_obj);
-
-	if (!float_obj || !bt_value_is_float(float_obj)) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (float_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	typed_float_obj->value = val;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(real_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL);
+	BT_ASSERT_PRE_VALUE_HOT(real_obj, "Value object");
+	BT_VALUE_TO_REAL(real_obj)->value = val;
+	BT_LOGV("Set real number value's raw value: value-addr=%p, value=%f",
+		real_obj, val);
 }
 
-enum bt_value_status bt_value_string_get(const struct bt_value *string_obj,
-		const char **val)
+const char *bt_value_string_get(const struct bt_value *string_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_string *typed_string_obj =
-		BT_VALUE_TO_STRING(string_obj);
-
-	if (!string_obj || !bt_value_is_string(string_obj) || !val) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	*val = typed_string_obj->gstr->str;
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(string_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING);
+	return BT_VALUE_TO_STRING(string_obj)->gstr->str;
 }
 
-enum bt_value_status bt_value_string_set(struct bt_value *string_obj,
-		const char *val)
+enum bt_value_status bt_private_value_string_set(
+		struct bt_private_value *string_obj, const char *val)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_string *typed_string_obj =
-		BT_VALUE_TO_STRING(string_obj);
-
-	if (!string_obj || !bt_value_is_string(string_obj) || !val) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (string_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	g_string_assign(typed_string_obj->gstr, val);
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(string_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING);
+	BT_ASSERT_PRE_VALUE_HOT(string_obj, "Value object");
+	g_string_assign(BT_VALUE_TO_STRING(string_obj)->gstr, val);
+	BT_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p",
+		string_obj, val);
+	return BT_VALUE_STATUS_OK;
 }
 
-int bt_value_array_size(const struct bt_value *array_obj)
+uint64_t bt_value_array_get_size(const struct bt_value *array_obj)
 {
-	int ret;
-	struct bt_value_array *typed_array_obj =
-		BT_VALUE_TO_ARRAY(array_obj);
-
-	if (!array_obj || !bt_value_is_array(array_obj)) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	ret = (int) typed_array_obj->garray->len;
-
-end:
-	return ret;
-}
-
-bool bt_value_array_is_empty(const struct bt_value *array_obj)
-{
-	return bt_value_array_size(array_obj) == 0;
+	BT_ASSERT_PRE_NON_NULL(array_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
+	return (uint64_t) BT_VALUE_TO_ARRAY(array_obj)->garray->len;
 }
 
-struct bt_value *bt_value_array_get(const struct bt_value *array_obj,
-		size_t index)
+struct bt_value *bt_value_array_borrow_element_by_index(
+		const struct bt_value *array_obj,
+		uint64_t index)
 {
-	struct bt_value *ret;
 	struct bt_value_array *typed_array_obj =
 		BT_VALUE_TO_ARRAY(array_obj);
 
-	if (!array_obj || !bt_value_is_array(array_obj) ||
-			index >= typed_array_obj->garray->len) {
-		ret = NULL;
-		goto end;
-	}
-
-	ret = g_ptr_array_index(typed_array_obj->garray, index);
-	bt_get(ret);
+	BT_ASSERT_PRE_NON_NULL(array_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
+	BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(index,
+		typed_array_obj->garray->len);
+	return g_ptr_array_index(typed_array_obj->garray, index);
+}
 
-end:
-	return ret;
+struct bt_private_value *bt_private_value_array_borrow_element_by_index(
+		const struct bt_private_value *array_obj,
+		uint64_t index)
+{
+	return (void *) bt_value_array_borrow_element_by_index(
+		(void *) array_obj, index);
 }
 
-enum bt_value_status bt_value_array_append(struct bt_value *array_obj,
+enum bt_value_status bt_private_value_array_append_element(
+		struct bt_private_value *array_obj,
 		struct bt_value *element_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_array *typed_array_obj =
 		BT_VALUE_TO_ARRAY(array_obj);
 
-	if (!array_obj || !bt_value_is_array(array_obj) || !element_obj) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (array_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
+	BT_ASSERT_PRE_NON_NULL(array_obj, "Array value object");
+	BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
+	BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object");
 	g_ptr_array_add(typed_array_obj->garray, element_obj);
-	bt_get(element_obj);
-
-end:
-	return ret;
+	bt_object_get_ref(element_obj);
+	BT_LOGV("Appended element to array value: array-value-addr=%p, "
+		"element-value-addr=%p, new-size=%u",
+		array_obj, element_obj, typed_array_obj->garray->len);
+	return BT_VALUE_STATUS_OK;
 }
 
-enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj,
-		bool val)
+enum bt_value_status bt_private_value_array_append_bool_element(
+		struct bt_private_value *array_obj, bt_bool val)
 {
 	enum bt_value_status ret;
-	struct bt_value *bool_obj = NULL;
-
-	bool_obj = bt_value_bool_create_init(val);
-	ret = bt_value_array_append(array_obj, bool_obj);
-	bt_put(bool_obj);
+	struct bt_private_value *bool_obj = NULL;
 
+	bool_obj = bt_private_value_bool_create_init(val);
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) bool_obj);
+	bt_object_put_ref(bool_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_integer(
-		struct bt_value *array_obj, int64_t val)
+enum bt_value_status bt_private_value_array_append_integer_element(
+		struct bt_private_value *array_obj, int64_t val)
 {
 	enum bt_value_status ret;
-	struct bt_value *integer_obj = NULL;
-
-	integer_obj = bt_value_integer_create_init(val);
-	ret = bt_value_array_append(array_obj, integer_obj);
-	bt_put(integer_obj);
+	struct bt_private_value *integer_obj = NULL;
 
+	integer_obj = bt_private_value_integer_create_init(val);
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) integer_obj);
+	bt_object_put_ref(integer_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj,
-		double val)
+enum bt_value_status bt_private_value_array_append_real_element(
+		struct bt_private_value *array_obj, double val)
 {
 	enum bt_value_status ret;
-	struct bt_value *float_obj = NULL;
-
-	float_obj = bt_value_float_create_init(val);
-	ret = bt_value_array_append(array_obj, float_obj);
-	bt_put(float_obj);
+	struct bt_private_value *real_obj = NULL;
 
+	real_obj = bt_private_value_real_create_init(val);
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) real_obj);
+	bt_object_put_ref(real_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj,
-		const char *val)
+enum bt_value_status bt_private_value_array_append_string_element(
+		struct bt_private_value *array_obj, const char *val)
 {
 	enum bt_value_status ret;
-	struct bt_value *string_obj = NULL;
-
-	string_obj = bt_value_string_create_init(val);
-	ret = bt_value_array_append(array_obj, string_obj);
-	bt_put(string_obj);
+	struct bt_private_value *string_obj = NULL;
 
+	string_obj = bt_private_value_string_create_init(val);
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) string_obj);
+	bt_object_put_ref(string_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_empty_array(
-		struct bt_value *array_obj)
+enum bt_value_status bt_private_value_array_append_empty_array_element(
+		struct bt_private_value *array_obj)
 {
 	enum bt_value_status ret;
-	struct bt_value *empty_array_obj = NULL;
-
-	empty_array_obj = bt_value_array_create();
-	ret = bt_value_array_append(array_obj, empty_array_obj);
-	bt_put(empty_array_obj);
+	struct bt_private_value *empty_array_obj = NULL;
 
+	empty_array_obj = bt_private_value_array_create();
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) empty_array_obj);
+	bt_object_put_ref(empty_array_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_empty_map(struct bt_value *array_obj)
+enum bt_value_status bt_private_value_array_append_empty_map_element(
+		struct bt_private_value *array_obj)
 {
 	enum bt_value_status ret;
-	struct bt_value *map_obj = NULL;
-
-	map_obj = bt_value_map_create();
-	ret = bt_value_array_append(array_obj, map_obj);
-	bt_put(map_obj);
+	struct bt_private_value *map_obj = NULL;
 
+	map_obj = bt_private_value_map_create();
+	ret = bt_private_value_array_append_element(array_obj,
+		(void *) map_obj);
+	bt_object_put_ref(map_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_array_set(struct bt_value *array_obj,
-		size_t index, struct bt_value *element_obj)
+enum bt_value_status bt_private_value_array_set_element_by_index(
+		struct bt_private_value *array_obj, uint64_t index,
+		struct bt_value *element_obj)
 {
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_array *typed_array_obj =
 		BT_VALUE_TO_ARRAY(array_obj);
 
-	if (!array_obj || !bt_value_is_array(array_obj) || !element_obj ||
-			index >= typed_array_obj->garray->len) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (array_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	bt_put(g_ptr_array_index(typed_array_obj->garray, index));
+	BT_ASSERT_PRE_NON_NULL(array_obj, "Array value object");
+	BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
+	BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object");
+	BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(index,
+		typed_array_obj->garray->len);
+	bt_object_put_ref(g_ptr_array_index(typed_array_obj->garray, index));
 	g_ptr_array_index(typed_array_obj->garray, index) = element_obj;
-	bt_get(element_obj);
-
-end:
-	return ret;
+	bt_object_get_ref(element_obj);
+	BT_LOGV("Set array value's element: array-value-addr=%p, "
+		"index=%" PRIu64 ", element-value-addr=%p",
+		array_obj, index, element_obj);
+	return BT_VALUE_STATUS_OK;
 }
 
-int bt_value_map_size(const struct bt_value *map_obj)
+uint64_t bt_value_map_get_size(const struct bt_value *map_obj)
 {
-	int ret;
-	struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj);
-
-	if (!map_obj || !bt_value_is_map(map_obj)) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	ret = (int) g_hash_table_size(typed_map_obj->ght);
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
+	return (uint64_t) g_hash_table_size(BT_VALUE_TO_MAP(map_obj)->ght);
 }
 
-bool bt_value_map_is_empty(const struct bt_value *map_obj)
+struct bt_value *bt_value_map_borrow_entry_value(const struct bt_value *map_obj,
+		const char *key)
 {
-	return bt_value_map_size(map_obj) == 0;
+	BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
+	BT_ASSERT_PRE_NON_NULL(key, "Key");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
+	return g_hash_table_lookup(BT_VALUE_TO_MAP(map_obj)->ght,
+		GUINT_TO_POINTER(g_quark_from_string(key)));
 }
 
-struct bt_value *bt_value_map_get(const struct bt_value *map_obj,
-		const char *key)
+struct bt_private_value *bt_private_value_map_borrow_entry_value(
+		const struct bt_private_value *map_obj, const char *key)
 {
-	GQuark quark;
-	struct bt_value *ret;
-	struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj);
-
-	if (!map_obj || !bt_value_is_map(map_obj) || !key) {
-		ret = NULL;
-		goto end;
-	}
-
-	quark = g_quark_from_string(key);
-	ret = g_hash_table_lookup(typed_map_obj->ght, GUINT_TO_POINTER(quark));
-
-	if (ret) {
-		bt_get(ret);
-	}
-
-end:
-	return ret;
+	return (void *) bt_value_map_borrow_entry_value((void *) map_obj, key);
 }
 
-bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key)
+bt_bool bt_value_map_has_entry(const struct bt_value *map_obj, const char *key)
 {
-	bool ret;
-	GQuark quark;
-	struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj);
-
-	if (!map_obj || !bt_value_is_map(map_obj) || !key) {
-		ret = false;
-		goto end;
-	}
-
-	quark = g_quark_from_string(key);
-	ret = bt_g_hash_table_contains(typed_map_obj->ght,
-		GUINT_TO_POINTER(quark));
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
+	BT_ASSERT_PRE_NON_NULL(key, "Key");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
+	return bt_g_hash_table_contains(BT_VALUE_TO_MAP(map_obj)->ght,
+		GUINT_TO_POINTER(g_quark_from_string(key)));
 }
 
-enum bt_value_status bt_value_map_insert(struct bt_value *map_obj,
+enum bt_value_status bt_private_value_map_insert_entry(
+		struct bt_private_value *map_obj,
 		const char *key, struct bt_value *element_obj)
 {
-	GQuark quark;
-	enum bt_value_status ret = BT_VALUE_STATUS_OK;
-	struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj);
-
-	if (!map_obj || !bt_value_is_map(map_obj) || !key || !element_obj) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
-	if (map_obj->is_frozen) {
-		ret = BT_VALUE_STATUS_FROZEN;
-		goto end;
-	}
-
-	quark = g_quark_from_string(key);
-	g_hash_table_insert(typed_map_obj->ght,
-		GUINT_TO_POINTER(quark), element_obj);
-	bt_get(element_obj);
-
-end:
-	return ret;
+	BT_ASSERT_PRE_NON_NULL(map_obj, "Map value object");
+	BT_ASSERT_PRE_NON_NULL(key, "Key");
+	BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
+	BT_ASSERT_PRE_VALUE_HOT(map_obj, "Map value object");
+	g_hash_table_insert(BT_VALUE_TO_MAP(map_obj)->ght,
+		GUINT_TO_POINTER(g_quark_from_string(key)), element_obj);
+	bt_object_get_ref(element_obj);
+	BT_LOGV("Inserted value into map value: map-value-addr=%p, "
+		"key=\"%s\", element-value-addr=%p",
+		map_obj, key, element_obj);
+	return BT_VALUE_STATUS_OK;
 }
 
-enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj,
-		const char *key, bool val)
+enum bt_value_status bt_private_value_map_insert_bool_entry(
+		struct bt_private_value *map_obj, const char *key, bt_bool val)
 {
 	enum bt_value_status ret;
-	struct bt_value *bool_obj = NULL;
-
-	bool_obj = bt_value_bool_create_init(val);
-	ret = bt_value_map_insert(map_obj, key, bool_obj);
-	bt_put(bool_obj);
+	struct bt_private_value *bool_obj = NULL;
 
+	bool_obj = bt_private_value_bool_create_init(val);
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) bool_obj);
+	bt_object_put_ref(bool_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj,
-		const char *key, int64_t val)
+enum bt_value_status bt_private_value_map_insert_integer_entry(
+		struct bt_private_value *map_obj, const char *key, int64_t val)
 {
 	enum bt_value_status ret;
-	struct bt_value *integer_obj = NULL;
-
-	integer_obj = bt_value_integer_create_init(val);
-	ret = bt_value_map_insert(map_obj, key, integer_obj);
-	bt_put(integer_obj);
+	struct bt_private_value *integer_obj = NULL;
 
+	integer_obj = bt_private_value_integer_create_init(val);
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) integer_obj);
+	bt_object_put_ref(integer_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj,
-		const char *key, double val)
+enum bt_value_status bt_private_value_map_insert_real_entry(
+		struct bt_private_value *map_obj, const char *key, double val)
 {
 	enum bt_value_status ret;
-	struct bt_value *float_obj = NULL;
-
-	float_obj = bt_value_float_create_init(val);
-	ret = bt_value_map_insert(map_obj, key, float_obj);
-	bt_put(float_obj);
+	struct bt_private_value *real_obj = NULL;
 
+	real_obj = bt_private_value_real_create_init(val);
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) real_obj);
+	bt_object_put_ref(real_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj,
-		const char *key, const char *val)
+enum bt_value_status bt_private_value_map_insert_string_entry(
+		struct bt_private_value *map_obj, const char *key,
+		const char *val)
 {
 	enum bt_value_status ret;
-	struct bt_value *string_obj = NULL;
-
-	string_obj = bt_value_string_create_init(val);
-	ret = bt_value_map_insert(map_obj, key, string_obj);
-	bt_put(string_obj);
+	struct bt_private_value *string_obj = NULL;
 
+	string_obj = bt_private_value_string_create_init(val);
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) string_obj);
+	bt_object_put_ref(string_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_empty_array(struct bt_value *map_obj,
-		const char *key)
+enum bt_value_status bt_private_value_map_insert_empty_array_entry(
+		struct bt_private_value *map_obj, const char *key)
 {
 	enum bt_value_status ret;
-	struct bt_value *array_obj = NULL;
-
-	array_obj = bt_value_array_create();
-	ret = bt_value_map_insert(map_obj, key, array_obj);
-	bt_put(array_obj);
+	struct bt_private_value *array_obj = NULL;
 
+	array_obj = bt_private_value_array_create();
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) array_obj);
+	bt_object_put_ref(array_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_empty_map(struct bt_value *map_obj,
-		const char *key)
+enum bt_value_status bt_private_value_map_insert_empty_map_entry(
+		struct bt_private_value *map_obj, const char *key)
 {
 	enum bt_value_status ret;
-	struct bt_value *empty_map_obj = NULL;
-
-	empty_map_obj = bt_value_map_create();
-	ret = bt_value_map_insert(map_obj, key, empty_map_obj);
-	bt_put(empty_map_obj);
+	struct bt_private_value *empty_map_obj = NULL;
 
+	empty_map_obj = bt_private_value_map_create();
+	ret = bt_private_value_map_insert_entry(map_obj, key,
+		(void *) empty_map_obj);
+	bt_object_put_ref(empty_map_obj);
 	return ret;
 }
 
-enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj,
-		bt_value_map_foreach_cb cb, void *data)
+enum bt_value_status bt_value_map_foreach_entry(const struct bt_value *map_obj,
+		bt_value_map_foreach_entry_cb cb, void *data)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	gpointer key, element_obj;
 	GHashTableIter iter;
 	struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj);
 
-	if (!map_obj || !bt_value_is_map(map_obj) || !cb) {
-		ret = BT_VALUE_STATUS_INVAL;
-		goto end;
-	}
-
+	BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
+	BT_ASSERT_PRE_NON_NULL(cb, "Callback");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
 	g_hash_table_iter_init(&iter, typed_map_obj->ght);
 
 	while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
 		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
 		if (!cb(key_str, element_obj, data)) {
-			ret = BT_VALUE_STATUS_CANCELLED;
+			BT_LOGV("User canceled the loop: key=\"%s\", "
+				"value-addr=%p, data=%p",
+				key_str, element_obj, data);
+			ret = BT_VALUE_STATUS_CANCELED;
 			break;
 		}
 	}
 
-end:
 	return ret;
 }
 
+enum bt_value_status bt_private_value_map_foreach_entry(
+		const struct bt_private_value *map_obj,
+		bt_private_value_map_foreach_entry_cb cb, void *data)
+{
+	return bt_value_map_foreach_entry((void *) map_obj,
+		(bt_value_map_foreach_entry_cb) cb, data);
+}
+
 struct extend_map_element_data {
-	struct bt_value *extended_obj;
-	bool got_error;
+	struct bt_private_value *extended_obj;
+	enum bt_value_status status;
 };
 
 static
-bool extend_map_element(const char *key,
+bt_bool extend_map_element(const char *key,
 		struct bt_value *extension_obj_elem, void *data)
 {
-	bool ret = true;
-
+	bt_bool ret = BT_TRUE;
 	struct extend_map_element_data *extend_data = data;
+	struct bt_private_value *extension_obj_elem_copy = NULL;
 
 	/* Copy object which is to replace the current one */
-	struct bt_value *extension_obj_elem_copy =
-		bt_value_copy(extension_obj_elem);
+	extend_data->status = bt_value_copy(&extension_obj_elem_copy,
+		extension_obj_elem);
+	if (extend_data->status) {
+		BT_LOGE("Cannot copy map element: addr=%p",
+			extension_obj_elem);
+		goto error;
+	}
+
+	BT_ASSERT(extension_obj_elem_copy);
 
 	/* Replace in extended object */
-	if (bt_value_map_insert(extend_data->extended_obj, key,
-			extension_obj_elem_copy)) {
+	extend_data->status = bt_private_value_map_insert_entry(
+		extend_data->extended_obj, key,
+		(void *) extension_obj_elem_copy);
+	if (extend_data->status) {
+		BT_LOGE("Cannot replace value in extended value: key=\"%s\", "
+			"extended-value-addr=%p, element-value-addr=%p",
+			key, extend_data->extended_obj,
+			extension_obj_elem_copy);
 		goto error;
 	}
 
 	goto end;
 
 error:
-	ret = false;
-	extend_data->got_error = true;
+	BT_ASSERT(extend_data->status != BT_VALUE_STATUS_OK);
+	ret = BT_FALSE;
 
 end:
-	BT_PUT(extension_obj_elem_copy);
-
+	BT_OBJECT_PUT_REF_AND_RESET(extension_obj_elem_copy);
 	return ret;
 }
 
-struct bt_value *bt_value_map_extend(struct bt_value *base_map_obj,
-		struct bt_value *extension_obj)
+enum bt_value_status bt_value_map_extend(
+		struct bt_private_value **extended_map_obj,
+		const struct bt_value *base_map_obj,
+		const struct bt_value *extension_obj)
 {
-	struct bt_value *extended_obj = NULL;
-	struct extend_map_element_data extend_data = { 0 };
+	struct extend_map_element_data extend_data = {
+		.extended_obj = NULL,
+		.status = BT_VALUE_STATUS_OK,
+	};
 
-	if (!bt_value_is_map(base_map_obj) || !bt_value_is_map(extension_obj)) {
-		goto error;
-	}
+	BT_ASSERT_PRE_NON_NULL(base_map_obj, "Base value object");
+	BT_ASSERT_PRE_NON_NULL(extension_obj, "Extension value object");
+	BT_ASSERT_PRE_NON_NULL(extended_map_obj,
+		"Extended value object (output)");
+	BT_ASSERT_PRE_VALUE_IS_TYPE(base_map_obj, BT_VALUE_TYPE_MAP);
+	BT_ASSERT_PRE_VALUE_IS_TYPE(extension_obj, BT_VALUE_TYPE_MAP);
+	BT_LOGD("Extending map value: base-value-addr=%p, extension-value-addr=%p",
+		base_map_obj, extension_obj);
+	*extended_map_obj = NULL;
 
 	/* Create copy of base map object to start with */
-	extended_obj = bt_value_copy(base_map_obj);
-	if (!extended_obj) {
+	extend_data.status = bt_value_copy(extended_map_obj, base_map_obj);
+	if (extend_data.status) {
+		BT_LOGE("Cannot copy base value: base-value-addr=%p",
+			base_map_obj);
 		goto error;
 	}
 
+	BT_ASSERT(extended_map_obj);
+
 	/*
 	 * For each key in the extension map object, replace this key
 	 * in the copied map object.
 	 */
-	extend_data.extended_obj = extended_obj;
+	extend_data.extended_obj = *extended_map_obj;
 
-	if (bt_value_map_foreach(extension_obj, extend_map_element,
+	if (bt_value_map_foreach_entry(extension_obj, extend_map_element,
 			&extend_data)) {
+		BT_LOGE("Cannot iterate on the extension object's elements: "
+			"extension-value-addr=%p", extension_obj);
 		goto error;
 	}
 
-	if (extend_data.got_error) {
+	if (extend_data.status) {
+		BT_LOGE("Failed to successfully iterate on the extension object's elements: "
+			"extension-value-addr=%p", extension_obj);
 		goto error;
 	}
 
+	BT_LOGD("Extended map value: extended-value-addr=%p",
+		*extended_map_obj);
 	goto end;
 
 error:
-	BT_PUT(extended_obj);
+	BT_OBJECT_PUT_REF_AND_RESET(*extended_map_obj);
+	*extended_map_obj = NULL;
 
 end:
-	return extended_obj;
+	return extend_data.status;
 }
 
-struct bt_value *bt_value_copy(const struct bt_value *object)
+enum bt_value_status bt_value_copy(struct bt_private_value **copy_obj,
+		const struct bt_value *object)
 {
-	struct bt_value *copy_obj = NULL;
+	enum bt_value_status status = BT_VALUE_STATUS_OK;
 
-	if (!object) {
-		goto end;
+	BT_ASSERT_PRE_NON_NULL(object, "Value object");
+	BT_ASSERT_PRE_NON_NULL(copy_obj, "Value object copy (output)");
+	BT_LOGD("Copying value object: addr=%p", object);
+	*copy_obj = copy_funcs[object->type](object);
+	if (*copy_obj) {
+		BT_LOGD("Copied value object: copy-value-addr=%p",
+			copy_obj);
+	} else {
+		status = BT_VALUE_STATUS_NOMEM;
+		*copy_obj = NULL;
+		BT_LOGE_STR("Failed to copy value object.");
 	}
 
-	copy_obj = copy_funcs[object->type](object);
-
-end:
-	return copy_obj;
+	return status;
 }
 
-bool bt_value_compare(const struct bt_value *object_a,
+bt_bool bt_value_compare(const struct bt_value *object_a,
 	const struct bt_value *object_b)
 {
-	bool ret = false;
+	bt_bool ret = BT_FALSE;
 
-	if (!object_a || !object_b) {
-		goto end;
-	}
+	BT_ASSERT_PRE_NON_NULL(object_a, "Value object A");
+	BT_ASSERT_PRE_NON_NULL(object_b, "Value object B");
 
 	if (object_a->type != object_b->type) {
+		BT_LOGV("Values are different: type mismatch: "
+			"value-a-addr=%p, value-b-addr=%p, "
+			"value-a-type=%s, value-b-type=%s",
+			object_a, object_b,
+			bt_common_value_type_string(object_a->type),
+			bt_common_value_type_string(object_b->type));
 		goto end;
 	}